#8545: Reorganize Git repositories -------------------------------------+------------------------------------ Reporter: hvr | Owner: hvr Type: task | Status: new Priority: normal | Milestone: 7.10.1 Component: Trac & Git | Version: Resolution: | Keywords: git Operating System: Unknown/Multiple | Architecture: Unknown/Multiple Type of failure: None/Unknown | Difficulty: Unknown Test Case: | Blocked By: Blocking: | Related Tickets: #8251 -------------------------------------+------------------------------------ Comment (by Herbert Valerio Riedel ): In [changeset:"66693401b98cb5aa912948af7bbd2182474f50c4/ghc"]: {{{ #!CommitTicketReference repository="ghc" revision="66693401b98cb5aa912948af7bbd2182474f50c4" Fold testsuite.git into ghc.git (re #8545) This commit performs a subtree merge of testsuite.git into ghc.git; The next commit will adapt `sync-all` et al. to the new situation. At the time of merge, testsuite.git was at commit [998a816ae89c4fd573f4abd7c6abb346cf7ee9af/testsuite] The following steps have been used to accomplish this merge: 1. Clone a fresh testsuite.git copy (& cd into) 2. Remove accidentally committed binary files from history git filter-branch \ --index-filter "git rm -r --cached --ignore-unmatch \ tests/haddock/should_compile_flag_nohaddock/a.out \ tests/haddock/should_compile_noflag_nohaddock/a.out \ tests/ghc-regress/haddock/should_compile_flag_nohaddock/a.out \ tests/ghc-regress/haddock/should_compile_noflag_nohaddock/a.out \ tests/ghc-regress/dph/diophantine/dph-diophantine-fast \ tests/ghc-regress/dph/diophantine/dph-diophantine-opt \ tests/ghc-regress/dph/primespj/dph-primespj-fast \ tests/ghc-regress/dph/quickhull/dph-quickhull-fast \ tests/ghc-regress/dph/smvm/dph-smvm \ tests/ghc-regress/dph/sumnats/dph-sumnats \ tests/ghc-regress/dph/words/dph-words-fast \ tests/ghc-regress/plugins/plugins01" \ HEAD 3. Rename all paths in testsuite.git to be prefixed with `testsuite/` git filter-branch -f --prune-empty --tree-filter \ "mkdir -p testsuite; \ git ls-tree --name-only \$GIT_COMMIT | xargs -I files mv files testsuite/" 4. cd into ghc/ checkout, and perform subtree merge of testsuite into ghc (see also http://nuclearsquid.com/writings/subtree-merging-and-you/) cd ../ghc/ git remote add -f testsuite ../testsuite/.git git merge -s ours --no-commit testsuite/master git read-tree --prefix=/ -u testsuite/master git commit Signed-off-by: Herbert Valerio Riedel }}} -- Ticket URL: http://ghc.haskell.org/trac/ghc/ticket/8545#comment:2 GHC http://www.haskell.org/ghc/ The Glasgow Haskell Compiler

#8545: Reorganize Git repositories -------------------------------------+------------------------------------ Reporter: hvr | Owner: hvr Type: task | Status: new Priority: normal | Milestone: 7.10.1 Component: Trac & Git | Version: Resolution: | Keywords: git Operating System: Unknown/Multiple | Architecture: Unknown/Multiple Type of failure: None/Unknown | Difficulty: Unknown Test Case: | Blocked By: Blocking: | Related Tickets: #8251 -------------------------------------+------------------------------------ Comment (by Herbert Valerio Riedel ): In [changeset:"ad44e47542a822ac3e02cf514b5d2be52880fc95/ghc"]: {{{ #!CommitTicketReference repository="ghc" revision="ad44e47542a822ac3e02cf514b5d2be52880fc95" Switch to relative URLs in .gitmodules Previously, the `http://`-protocol part was hardcoded in the URLs, causing the initial clone process to fall back to `http://` even when the ghc.git repo was cloned via one of the other 3 supported transport protocols. This is slightly related to #8545, as it will make it possible to e.g. git clone --recursive git://git.haskell.org/ghc and clone ghc.git including all submodules in one go (i.e. w/o `sync- all`), and w/o falling back to a different (hardwired) Git transport protocol for the submodules. Signed-off-by: Herbert Valerio Riedel }}} -- Ticket URL: http://ghc.haskell.org/trac/ghc/ticket/8545#comment:4 GHC http://www.haskell.org/ghc/ The Glasgow Haskell Compiler

#8545: Reorganize Git repositories -------------------------------------+------------------------------------ Reporter: hvr | Owner: hvr Type: task | Status: new Priority: normal | Milestone: 7.10.1 Component: Trac & Git | Version: Resolution: | Keywords: git Operating System: Unknown/Multiple | Architecture: Unknown/Multiple Type of failure: None/Unknown | Difficulty: Unknown Test Case: | Blocked By: Blocking: | Related Tickets: #8251 -------------------------------------+------------------------------------ Comment (by Herbert Valerio Riedel ): In [changeset:"a6e68af1aba7294a18ecb15784d9fe5d90289101/ghc"]: {{{ #!CommitTicketReference repository="ghc" revision="a6e68af1aba7294a18ecb15784d9fe5d90289101" Fold ghc-prim.git into ghc.git (re #8545) At the time of merge, ghc-prim.git was at [ad9bf96815cb5a9bb4acc51c99eff20be3e50da3/ghc-prim] Signed-off-by: Herbert Valerio Riedel }}} -- Ticket URL: http://ghc.haskell.org/trac/ghc/ticket/8545#comment:6 GHC http://www.haskell.org/ghc/ The Glasgow Haskell Compiler

#8545: Reorganize Git repositories -------------------------------------+------------------------------------ Reporter: hvr | Owner: hvr Type: task | Status: new Priority: normal | Milestone: 7.10.1 Component: Trac & Git | Version: Resolution: | Keywords: git Operating System: Unknown/Multiple | Architecture: Unknown/Multiple Type of failure: None/Unknown | Difficulty: Unknown Test Case: | Blocked By: Blocking: | Related Tickets: #8251 -------------------------------------+------------------------------------ Comment (by Herbert Valerio Riedel ): In [changeset:"85febc048d733eb5c8a942e505af26156295f3a6/ghc"]: {{{ #!CommitTicketReference repository="ghc" revision="85febc048d733eb5c8a942e505af26156295f3a6" Fold integer-simple.git into ghc.git (re #8545) At the time of merge, integer-simple.git was at [9e8b924f68c4cdb6c7ae88f274baa3560aaa305e/integer-simple] Signed-off-by: Herbert Valerio Riedel }}} -- Ticket URL: http://ghc.haskell.org/trac/ghc/ticket/8545#comment:8 GHC http://www.haskell.org/ghc/ The Glasgow Haskell Compiler

#8545: Reorganize Git repositories -------------------------------------+------------------------------------ Reporter: hvr | Owner: hvr Type: task | Status: new Priority: normal | Milestone: 7.10.1 Component: Trac & Git | Version: Resolution: | Keywords: git Operating System: Unknown/Multiple | Architecture: Unknown/Multiple Type of failure: None/Unknown | Difficulty: Unknown Test Case: | Blocked By: Blocking: | Related Tickets: #8251 -------------------------------------+------------------------------------ Comment (by Herbert Valerio Riedel ): In [changeset:"8bcb2068e496b36d74c655c868cc93be2de45d94/ghc"]: {{{ #!CommitTicketReference repository="ghc" revision="8bcb2068e496b36d74c655c868cc93be2de45d94" Fold template-haskell.git into ghc.git (re #8545) At the time of merge, template-haskell.git was at [9bcc122819a6f4a2ae7ad569717324b8368e801c/template-haskell] Signed-off-by: Herbert Valerio Riedel }}} -- Ticket URL: http://ghc.haskell.org/trac/ghc/ticket/8545#comment:10 GHC http://www.haskell.org/ghc/ The Glasgow Haskell Compiler

#8545: Reorganize Git repositories -------------------------------------+------------------------------------ Reporter: hvr | Owner: hvr Type: task | Status: new Priority: normal | Milestone: 7.10.1 Component: Trac & Git | Version: Resolution: | Keywords: git Operating System: Unknown/Multiple | Architecture: Unknown/Multiple Type of failure: None/Unknown | Difficulty: Unknown Test Case: | Blocked By: Blocking: | Related Tickets: #8251 -------------------------------------+------------------------------------ Comment (by Herbert Valerio Riedel ): In [changeset:"386e874e365e310214b701e6f3cb74b4f75348f4/ghc"]: {{{ #!CommitTicketReference repository="ghc" revision="386e874e365e310214b701e6f3cb74b4f75348f4" Update Cabal source-repository entries (re #8545) This adapts the source-repository entries to match the new situation of base.git, ghc-prim.git, integer-gmp.git, integer-simple.git, and template-haskell.git being folded into ghc.git Signed-off-by: Herbert Valerio Riedel }}} -- Ticket URL: http://ghc.haskell.org/trac/ghc/ticket/8545#comment:12 GHC http://www.haskell.org/ghc/ The Glasgow Haskell Compiler

#8545: Reorganize Git repositories -------------------------------------+------------------------------------ Reporter: hvr | Owner: hvr Type: task | Status: new Priority: normal | Milestone: 7.10.1 Component: Trac & Git | Version: Resolution: | Keywords: git Operating System: Unknown/Multiple | Architecture: Unknown/Multiple Type of failure: None/Unknown | Difficulty: Unknown Test Case: | Blocked By: Blocking: | Related Tickets: #8251 -------------------------------------+------------------------------------ Comment (by hvr): In [changeset:"33e585d6eacae19e83862a05b650373b536095fa/ghc"]: {{{ #!CommitTicketReference repository="ghc" revision="33e585d6eacae19e83862a05b650373b536095fa" Handle base et al. specially in foreachLibrary.mk This adapts the foreachLibrary rule to match the new situation of base.git, ghc-prim.git, integer-gmp.git, integer-simple.git, and template-haskell.git being folded into ghc.git (re #9016), and thus not being mentioned anymore in the `packages` file. One visible effect of this oversight was that the `clean_libraries` make target would fail to clean those packages. Signed-off-by: Herbert Valerio Riedel }}} (this was wrongly filed in #9016) -- Ticket URL: http://ghc.haskell.org/trac/ghc/ticket/8545#comment:14 GHC http://www.haskell.org/ghc/ The Glasgow Haskell Compiler

#8545: Reorganize Git repositories -------------------------------------+------------------------------------ Reporter: hvr | Owner: hvr Type: task | Status: new Priority: normal | Milestone: 7.10.1 Component: Trac & Git | Version: Resolution: | Keywords: git Operating System: Unknown/Multiple | Architecture: Unknown/Multiple Type of failure: None/Unknown | Difficulty: Unknown Test Case: | Blocked By: Blocking: | Related Tickets: #8251 -------------------------------------+------------------------------------ Comment (by Thomas Miedema ): In [changeset:"72fe49d88565fc1dd807a0e185a5aa6fc4989ea0/ghc"]: {{{ #!CommitTicketReference repository="ghc" revision="72fe49d88565fc1dd807a0e185a5aa6fc4989ea0" sync-all: infer remotepath from .gitmodules file After this commit, running `sync-all remote set-url` works properly for the haddock package: command: ./sync-all -r git://git.haskell.org remote set-url origin before: git://git.haskell.org/packages/haddock.git after: git://git.haskell.org/haddock.git By doing the `remotepath` lookup before the `$is_github_repo` check, running `sync-all remote set-url` now also works properly for submodule repos on github: command: ./sync-all -r git://github.com/ghc remote set-url origin before: git://github.com/ghc/packages/binary after: git://github.com/ghc/packages-binary * Relevant prior commits: 4f4357 "Make `sync-all remote set-url` use normalized `/packages/` urls" 34b072 "Convert haddock into a proper submodule (re #8545)" 974a97 "sync-all: Apply submodule url rewriting also to stuff in util/" }}} -- Ticket URL: http://ghc.haskell.org/trac/ghc/ticket/8545#comment:16 GHC http://www.haskell.org/ghc/ The Glasgow Haskell Compiler