[GHC] #9212: Cleanup of sync-all
#9212: Cleanup of sync-all ------------------------------------+------------------------------------- Reporter: thomie | Owner: hvr Type: bug | Status: new Priority: normal | Milestone: Component: Trac & Git | Version: Keywords: | Operating System: Unknown/Multiple Architecture: Unknown/Multiple | Type of failure: Other Difficulty: Unknown | Test Case: Blocked By: | Blocking: Related Tickets: | ------------------------------------+------------------------------------- Some dead code removal and small bug fixes. -- Ticket URL: <http://ghc.haskell.org/trac/ghc/ticket/9212> GHC <http://www.haskell.org/ghc/> The Glasgow Haskell Compiler
#9212: Cleanup of sync-all -------------------------------------+------------------------------------ Reporter: thomie | Owner: hvr Type: bug | Status: patch Priority: normal | Milestone: Component: Trac & Git | Version: Resolution: | Keywords: Operating System: Unknown/Multiple | Architecture: Unknown/Multiple Type of failure: Other | Difficulty: Unknown Test Case: | Blocked By: Blocking: | Related Tickets: -------------------------------------+------------------------------------ Changes (by thomie): * status: new => patch -- Ticket URL: <http://ghc.haskell.org/trac/ghc/ticket/9212#comment:1> GHC <http://www.haskell.org/ghc/> The Glasgow Haskell Compiler
#9212: Cleanup of sync-all -------------------------------------+------------------------------------ Reporter: thomie | Owner: hvr Type: bug | Status: patch Priority: normal | Milestone: Component: Trac & Git | Version: Resolution: | Keywords: Operating System: Unknown/Multiple | Architecture: Unknown/Multiple Type of failure: Other | Difficulty: Unknown Test Case: | Blocked By: Blocking: | Related Tickets: -------------------------------------+------------------------------------ Comment (by thomie): Concerning patch `0003-Delete-dead-code.patch`, also see this mailinglist [http://www.haskell.org/pipermail/ghc-devs/2013-August/002096.html reply]. -- Ticket URL: <http://ghc.haskell.org/trac/ghc/ticket/9212#comment:2> GHC <http://www.haskell.org/ghc/> The Glasgow Haskell Compiler
#9212: Cleanup of sync-all -------------------------------------+------------------------------------ Reporter: thomie | Owner: hvr Type: bug | Status: patch Priority: normal | Milestone: Component: Trac & Git | Version: Resolution: | Keywords: Operating System: Unknown/Multiple | Architecture: Unknown/Multiple Type of failure: Other | Difficulty: Unknown Test Case: | Blocked By: Blocking: | Related Tickets: -------------------------------------+------------------------------------ Comment (by thomie): Patch 4.5 should be applied before (the improved) patch 5. Both patches fix bugs. See the commit messages. -- Ticket URL: <http://ghc.haskell.org/trac/ghc/ticket/9212#comment:3> GHC <http://www.haskell.org/ghc/> The Glasgow Haskell Compiler
#9212: Cleanup of sync-all -------------------------------------+------------------------------------ Reporter: thomie | Owner: hvr Type: bug | Status: patch Priority: normal | Milestone: Component: Trac & Git | Version: Resolution: | Keywords: Operating System: Unknown/Multiple | Architecture: Unknown/Multiple Type of failure: Other | Difficulty: Unknown Test Case: | Blocked By: Blocking: | Related Tickets: -------------------------------------+------------------------------------ Comment (by nomeata): Do you have a git repo somewhere with these commits as a branch? Would make it a bit easier. And for some reason I miss a test suite for `sync-all` :-) -- Ticket URL: <http://ghc.haskell.org/trac/ghc/ticket/9212#comment:4> GHC <http://www.haskell.org/ghc/> The Glasgow Haskell Compiler
#9212: Cleanup of sync-all -------------------------------------+------------------------------------ Reporter: thomie | Owner: hvr Type: bug | Status: patch Priority: normal | Milestone: Component: Trac & Git | Version: Resolution: | Keywords: Operating System: Unknown/Multiple | Architecture: Unknown/Multiple Type of failure: Other | Difficulty: Unknown Test Case: | Blocked By: Blocking: | Related Tickets: -------------------------------------+------------------------------------ Comment (by thomie): Here you go, all squashed up and rebased: https://github.com/thomie/ghc/commits/wip/T9212 Thanks for looking into this. A testsuite would need some work I'm afraid. -- Ticket URL: <http://ghc.haskell.org/trac/ghc/ticket/9212#comment:5> GHC <http://www.haskell.org/ghc/> The Glasgow Haskell Compiler
#9212: Cleanup of sync-all -------------------------------------+------------------------------------ Reporter: thomie | Owner: hvr Type: bug | Status: patch Priority: normal | Milestone: Component: Trac & Git | Version: Resolution: | Keywords: Operating System: Unknown/Multiple | Architecture: Unknown/Multiple Type of failure: Other | Difficulty: Unknown Test Case: | Blocked By: Blocking: | Related Tickets: -------------------------------------+------------------------------------ Comment (by nomeata): The patches themselves look good, judging from reading. But there are problems: {{{ $ git clone ~/build/haskell/ghc $ cd ghc $ ./sync-all get == running git config core.ignorecase true == running git submodule init Submodul 'libffi-tarballs' (/home/jojo/build/haskell/libffi-tarballs.git) für Pfad 'libffi-tarballs' in die Konfiguration eingetragen. Submodul 'libraries/Cabal' (/home/jojo/build/haskell/packages/Cabal.git) für Pfad 'libraries/Cabal' in die Konfiguration eingetragen. Submodul 'libraries/Win32' (/home/jojo/build/haskell/packages/Win32.git) für Pfad 'libraries/Win32' in die Konfiguration eingetragen. Submodul 'libraries/array' (/home/jojo/build/haskell/packages/array.git) für Pfad 'libraries/array' in die Konfiguration eingetragen. Submodul 'libraries/binary' (/home/jojo/build/haskell/packages/binary.git) für Pfad 'libraries/binary' in die Konfiguration eingetragen. Submodul 'libraries/bytestring' (/home/jojo/build/haskell/packages/bytestring.git) für Pfad 'libraries/bytestring' in die Konfiguration eingetragen. Submodul 'libraries/containers' (/home/jojo/build/haskell/packages/containers.git) für Pfad 'libraries/containers' in die Konfiguration eingetragen. Submodul 'libraries/deepseq' (/home/jojo/build/haskell/packages/deepseq.git) für Pfad 'libraries/deepseq' in die Konfiguration eingetragen. Submodul 'libraries/directory' (/home/jojo/build/haskell/packages/directory.git) für Pfad 'libraries/directory' in die Konfiguration eingetragen. Submodul 'libraries/dph' (/home/jojo/build/haskell/packages/dph.git) für Pfad 'libraries/dph' in die Konfiguration eingetragen. Submodul 'libraries/filepath' (/home/jojo/build/haskell/packages/filepath.git) für Pfad 'libraries/filepath' in die Konfiguration eingetragen. Submodul 'libraries/haskeline' (/home/jojo/build/haskell/packages/haskeline.git) für Pfad 'libraries/haskeline' in die Konfiguration eingetragen. Submodul 'libraries/haskell2010' (/home/jojo/build/haskell/packages/haskell2010.git) für Pfad 'libraries/haskell2010' in die Konfiguration eingetragen. Submodul 'libraries/haskell98' (/home/jojo/build/haskell/packages/haskell98.git) für Pfad 'libraries/haskell98' in die Konfiguration eingetragen. Submodul 'libraries/hoopl' (/home/jojo/build/haskell/packages/hoopl.git) für Pfad 'libraries/hoopl' in die Konfiguration eingetragen. Submodul 'libraries/hpc' (/home/jojo/build/haskell/packages/hpc.git) für Pfad 'libraries/hpc' in die Konfiguration eingetragen. Submodul 'libraries/old-locale' (/home/jojo/build/haskell/packages/old- locale.git) für Pfad 'libraries/old-locale' in die Konfiguration eingetragen. Submodul 'libraries/old-time' (/home/jojo/build/haskell/packages/old- time.git) für Pfad 'libraries/old-time' in die Konfiguration eingetragen. Submodul 'libraries/parallel' (/home/jojo/build/haskell/packages/parallel.git) für Pfad 'libraries/parallel' in die Konfiguration eingetragen. Submodul 'libraries/pretty' (/home/jojo/build/haskell/packages/pretty.git) für Pfad 'libraries/pretty' in die Konfiguration eingetragen. Submodul 'libraries/primitive' (/home/jojo/build/haskell/packages/primitive.git) für Pfad 'libraries/primitive' in die Konfiguration eingetragen. Submodul 'libraries/process' (/home/jojo/build/haskell/packages/process.git) für Pfad 'libraries/process' in die Konfiguration eingetragen. Submodul 'libraries/random' (/home/jojo/build/haskell/packages/random.git) für Pfad 'libraries/random' in die Konfiguration eingetragen. Submodul 'libraries/stm' (/home/jojo/build/haskell/packages/stm.git) für Pfad 'libraries/stm' in die Konfiguration eingetragen. Submodul 'libraries/terminfo' (/home/jojo/build/haskell/packages/terminfo.git) für Pfad 'libraries/terminfo' in die Konfiguration eingetragen. Submodul 'libraries/time' (/home/jojo/build/haskell/packages/time.git) für Pfad 'libraries/time' in die Konfiguration eingetragen. Submodul 'libraries/transformers' (/home/jojo/build/haskell/packages/transformers.git) für Pfad 'libraries/transformers' in die Konfiguration eingetragen. Submodul 'libraries/unix' (/home/jojo/build/haskell/packages/unix.git) für Pfad 'libraries/unix' in die Konfiguration eingetragen. Submodul 'libraries/vector' (/home/jojo/build/haskell/packages/vector.git) für Pfad 'libraries/vector' in die Konfiguration eingetragen. Submodul 'libraries/xhtml' (/home/jojo/build/haskell/packages/xhtml.git) für Pfad 'libraries/xhtml' in die Konfiguration eingetragen. Submodul 'nofib' (/home/jojo/build/haskell/nofib.git) für Pfad 'nofib' in die Konfiguration eingetragen. Submodul 'utils/haddock' (/home/jojo/build/haskell/haddock.git) für Pfad 'utils/haddock' in die Konfiguration eingetragen. Submodul 'utils/hsc2hs' (/home/jojo/build/haskell/hsc2hs.git) für Pfad 'utils/hsc2hs' in die Konfiguration eingetragen. == running git config submodule.libraries/Cabal.url /home/jojo/build/haskell/ghc/libraries/Cabal == running git config submodule.libraries/Win32.url /home/jojo/build/haskell/ghc/libraries/Win32 == running git config submodule.libraries/array.url /home/jojo/build/haskell/ghc/libraries/array == running git config submodule.libraries/binary.url /home/jojo/build/haskell/ghc/libraries/binary == running git config submodule.libraries/bytestring.url /home/jojo/build/haskell/ghc/libraries/bytestring == running git config submodule.libraries/containers.url /home/jojo/build/haskell/ghc/libraries/containers == running git config submodule.libraries/deepseq.url /home/jojo/build/haskell/ghc/libraries/deepseq == running git config submodule.libraries/directory.url /home/jojo/build/haskell/ghc/libraries/directory == running git config submodule.libraries/filepath.url /home/jojo/build/haskell/ghc/libraries/filepath == running git config submodule.libraries/haskeline.url /home/jojo/build/haskell/ghc/libraries/haskeline == running git config submodule.libraries/haskell2010.url /home/jojo/build/haskell/ghc/libraries/haskell2010 == running git config submodule.libraries/haskell98.url /home/jojo/build/haskell/ghc/libraries/haskell98 == running git config submodule.libraries/hoopl.url /home/jojo/build/haskell/ghc/libraries/hoopl == running git config submodule.libraries/hpc.url /home/jojo/build/haskell/ghc/libraries/hpc == running git config submodule.libraries/old-locale.url /home/jojo/build/haskell/ghc/libraries/old-locale == running git config submodule.libraries/old-time.url /home/jojo/build/haskell/ghc/libraries/old-time == running git config submodule.libraries/pretty.url /home/jojo/build/haskell/ghc/libraries/pretty == running git config submodule.libraries/primitive.url /home/jojo/build/haskell/ghc/libraries/primitive == running git config submodule.libraries/process.url /home/jojo/build/haskell/ghc/libraries/process == running git config submodule.libraries/random.url /home/jojo/build/haskell/ghc/libraries/random == running git config submodule.libraries/terminfo.url /home/jojo/build/haskell/ghc/libraries/terminfo == running git config submodule.libraries/time.url /home/jojo/build/haskell/ghc/libraries/time == running git config submodule.libraries/transformers.url /home/jojo/build/haskell/ghc/libraries/transformers == running git config submodule.libraries/unix.url /home/jojo/build/haskell/ghc/libraries/unix == running git config submodule.libraries/vector.url /home/jojo/build/haskell/ghc/libraries/vector == running git config submodule.libraries/xhtml.url /home/jojo/build/haskell/ghc/libraries/xhtml == running git config submodule.utils/haddock.url /home/jojo/build/haskell/ghc/utils/haddock == running git config submodule.utils/hsc2hs.url /home/jojo/build/haskell/ghc/utils/hsc2hs == running git submodule update fatal: Repository '/home/jojo/build/haskell/libffi-tarballs.git' existiert nicht. Klonen von '/home/jojo/build/haskell/libffi-tarballs.git' in Submodul-Pfad 'libffi-tarballs' fehlgeschlagen git failed: 256 at ./sync-all line 113. }}} But then, this problem is already there without your patches... anyways, can you fix that on your branch? I’ll then run a few simple tests and merge your patches. -- Ticket URL: <http://ghc.haskell.org/trac/ghc/ticket/9212#comment:6> GHC <http://www.haskell.org/ghc/> The Glasgow Haskell Compiler
#9212: Cleanup of sync-all -------------------------------------+------------------------------------ Reporter: thomie | Owner: hvr Type: bug | Status: patch Priority: normal | Milestone: Component: Trac & Git | Version: Resolution: | Keywords: Operating System: Unknown/Multiple | Architecture: Unknown/Multiple Type of failure: Other | Difficulty: Unknown Test Case: | Blocked By: Blocking: | Related Tickets: -------------------------------------+------------------------------------ Comment (by Joachim Breitner <mail@…>): In [changeset:"c61260e0f716c32334ef32c759616f12f49b579e/ghc"]: {{{ #!CommitTicketReference repository="ghc" revision="c61260e0f716c32334ef32c759616f12f49b579e" Merge Thomas Miedema’s syn-all improvments as submitted on #9212. }}} -- Ticket URL: <http://ghc.haskell.org/trac/ghc/ticket/9212#comment:7> GHC <http://www.haskell.org/ghc/> The Glasgow Haskell Compiler
#9212: Cleanup of sync-all -------------------------------------+------------------------------------ Reporter: thomie | Owner: hvr Type: bug | Status: patch Priority: normal | Milestone: Component: Trac & Git | Version: Resolution: | Keywords: Operating System: Unknown/Multiple | Architecture: Unknown/Multiple Type of failure: Other | Difficulty: Unknown Test Case: | Blocked By: Blocking: | Related Tickets: -------------------------------------+------------------------------------ Comment (by nomeata): Nevermind, fixed these problems myself and now your commits look good. Thanks for your contribution! If you could continue to keep an eye on `./sync-all`, that’d be great. -- Ticket URL: <http://ghc.haskell.org/trac/ghc/ticket/9212#comment:8> GHC <http://www.haskell.org/ghc/> The Glasgow Haskell Compiler
#9212: Cleanup of sync-all -------------------------------------+------------------------------------ Reporter: thomie | Owner: hvr Type: bug | Status: closed Priority: normal | Milestone: Component: Trac & Git | Version: Resolution: fixed | Keywords: Operating System: Unknown/Multiple | Architecture: Unknown/Multiple Type of failure: Other | Difficulty: Unknown Test Case: | Blocked By: Blocking: | Related Tickets: -------------------------------------+------------------------------------ Changes (by nomeata): * status: patch => closed * resolution: => fixed -- Ticket URL: <http://ghc.haskell.org/trac/ghc/ticket/9212#comment:9> GHC <http://www.haskell.org/ghc/> The Glasgow Haskell Compiler
#9212: Cleanup of sync-all -------------------------------------+------------------------------------ Reporter: thomie | Owner: hvr Type: bug | Status: closed Priority: normal | Milestone: Component: Trac & Git | Version: Resolution: fixed | Keywords: Operating System: Unknown/Multiple | Architecture: Unknown/Multiple Type of failure: Other | Difficulty: Unknown Test Case: | Blocked By: Blocking: | Related Tickets: -------------------------------------+------------------------------------ Comment (by Austin Seipp <austin@…>): In [changeset:"0f31c2e5c1cf240a78221bb09578f6eb7084ada5/ghc"]: {{{ #!CommitTicketReference repository="ghc" revision="0f31c2e5c1cf240a78221bb09578f6eb7084ada5" Cleanup and better documentation of sync-all script Summary: Rumor has it that sync-all is slowly on the way out. Now that all subrepositories have been turned into git submodules, sync-all might not be needed anymore. Nevertheless, here are some changes I had made while trying to understand why it existed in the first place: * update comments + help text * rename some variables for maintainability * s/branch_name/remote_name/ origin is the name of a remote, not a branch * s/repo_base/remote_root/ the word *remote* is key here * s/defaultrepo/default_root/ this was a darcsism, and it doesn't refer to a repository but to the root directory of all repositories * small tweaks * .git can be a file nowadays * don't skip END actions on exceptions #8886 reverts d523f9b3d4ce3463e8816cad2139ea397e00f8d1 Test Plan: Why revert d523f9b3d4ce3463e8816cad2139ea397e00f8d1? I put an old haddock repository from http://darcs.haskell.org/haddock2.git back in my tree. Now, when running `sync-all get`, the following happens: 1. I get a cryptic error saying: fatal: reference is not a tree: 5412c262f403e52be45d607b34eb3a5806ea2a76 Unable to checkout '5412c262f403e52be45d607b34eb3a5806ea2a76' in submodule path 'utils/haddock' git failed: 256 at ./sync-all line 112. 2. sync-all checks if maybe an old haddock repository is present 3. I get a clear warning saying: ============================ ATTENTION! You have an old haddock repository in your GHC tree! Please remove it (e.g. "rm -r utils/haddock"), and then run "./sync-all get" to get the new repository. ============================ Without commit d523f9b3d4ce3463e8816cad2139ea397e00f8d1 reverted, steps 2 and 3 were skipped. The problem that commit tried to solve, is now solved with 7012ed8515100b4947383e93b82dbff7a0aa835c. Reviewers: nomeata, austin, hvr Reviewed By: austin, hvr Subscribers: simonmar, ezyang, carter Differential Revision: https://phabricator.haskell.org/D178 GHC Trac Issues: #8886, #9212 }}} -- Ticket URL: <http://ghc.haskell.org/trac/ghc/ticket/9212#comment:10> GHC <http://www.haskell.org/ghc/> The Glasgow Haskell Compiler
participants (1)
-
GHC