Search code examples
patchdarcs

How to inspect the explicit dependencies of a patch in darcs?


As we know, explicit patch dependencies can be recorded by darcs record --ask-deps. (A use I see for this is preventing situations where "It's easy to move a patch that uses a feature to a point before the feature is introduced.".)

So, having a repo where I should have made such deps, I want to check whether it's true. How do I inspect the recorded explicit dependencies of a selected patch?

Google could find me some code in Darcs/UI/Commands/Rebase.hs which prints a warning if a patch had such deps, but I don't know yet if there is a stand-alone command that would just give this information (not coupled to an action):

where doAdd :: (RepoPatch p, ApplyState p ~ Tree)
            => Repository (Rebasing p) wR wU wT
            -> FL (WDDNamed p) wT wT2
            -> HijackT IO (Repository (Rebasing p) wR wU wT2, FL (RebaseName p) wT2 wT2)
      doAdd repo NilFL = return (repo, NilFL)
      doAdd repo ((p :: WDDNamed p wT wU) :>:ps) = do
          case wddDependedOn p of
              [] -> return ()
              deps -> liftIO $ do
                  -- It might make sense to only print out this message once, but we might find
                  -- that the dropped dependencies are interspersed with other output,
                  -- e.g. if running with --ask-deps
                  putStr $ "Warning: dropping the following explicit "
                             ++ englishNum (length deps) (Noun "dependency") ":\n\n"
                  let printIndented n =
                          mapM_ (putStrLn . (replicate n ' '++)) . lines .
                          renderString Encode . showPatchInfo
                  putStrLn . renderString Encode . showPatchInfo .
                          patch2patchinfo $ wddPatch p
                  putStr " depended on:\n"
                  mapM_ (printIndented 2) deps
                  putStr "\n"
...

Perhaps, a command that outputs a .dpatch would include this information in the dpatch. I should check this now.

Neither darcs log -v (http://bugs.darcs.net/issue959) nor darcs diff outputs this information according to my experiments.


Solution

  • One way is to output a .dpatch with darcs send, and look into it.

    It's not a very convenient way, because

    1. darcs send needs a target repo (even with -o FILE.dpatch);
    2. several patches get into the bundle, instead of the single one we want to inspect...

    Here is an example (I've also checked that darcs log -v doesn't give the information about the explicit dependencies):

    Preparation:

    $ mkdir test-darcs-deps
    $ cd test-darcs-deps/
    $ darcs init
    $ echo a > a
    $ darcs add a
    $ darcs rec -m A
    $ echo b > b
    $ darcs add b
    $ darcs rec -m B
    

    Recording the explicit dependency:

    $ echo b2 > b
    $ darcs rec --ask-deps
    hunk ./b 1
    -b
    +b2
    Shall I record this change? (1/1)  [ynW...], or ? for more options: y
    Do you want to record these changes? [Yglqk...], or ? for more options: y
    patch 1f59d082f61f1fb8d57f5f5199869d1fc21b2435
    Author: Ivan Zakharyaschev <imz@altlinux.org>
    Date:   Sat Jan  9 01:28:07 MSK 2016
      * A
    Shall I depend on this patch? (1/1)  [ynW...], or ? for more options: y
    Do you want to depend on these patches? [Yglqk...], or ? for more options: y
    Finished recording patch 'B2'
    

    Inspecting the deps (I had to refer to a non-related darcs repo in order for darcs send to work!):

    $ darcs send -o ../test-darcs-deps.dpatch
    Missing argument:  [REPOSITORY]
    Usage: darcs send [OPTION]... [REPOSITORY]
    Prepare a bundle of patches to be applied to some target repository.
    
    See darcs help send for details.
    
    $ darcs send -o ../test-darcs-deps.dpatch ../test-darcs
    HINT: if you want to change the default remote repository to
          /home/imz/tests/test-darcs,
          quit now and issue the same command with the --set-default flag.
    patch 1f59d082f61f1fb8d57f5f5199869d1fc21b2435
    Author: Ivan Zakharyaschev <imz@altlinux.org>
    Date:   Sat Jan  9 01:28:07 MSK 2016
      * A
    
        A ./a
    Shall I send this patch? (1/3)  [ynW...], or ? for more options: w
    patch 151c8321b2bc36df7ba09dcab0d17c853ed31577
    Author: Ivan Zakharyaschev <imz@altlinux.org>
    Date:   Sat Jan  9 01:28:32 MSK 2016
      * B
    
        A ./b
    Shall I send this patch? (2/3)  [ynW...], or ? for more options: w
    patch f697ac56e8241f5a906c010650b683638944ebf2
    Author: Ivan Zakharyaschev <imz@altlinux.org>
    Date:   Sat Jan  9 01:28:50 MSK 2016
      * B2
    
        M ./b -1 +1
    Shall I send this patch? (3/3)  [ynW...], or ? for more options: y
    Do you want to send these patches? [Yglqk...], or ? for more options: l
    ---- Already selected patches ----
    patch 151c8321b2bc36df7ba09dcab0d17c853ed31577
    Author: Ivan Zakharyaschev <imz@altlinux.org>
    Date:   Sat Jan  9 01:28:32 MSK 2016
      * B
    
        A ./b
    patch 1f59d082f61f1fb8d57f5f5199869d1fc21b2435
    Author: Ivan Zakharyaschev <imz@altlinux.org>
    Date:   Sat Jan  9 01:28:07 MSK 2016
      * A
    
        A ./a
    patch f697ac56e8241f5a906c010650b683638944ebf2
    Author: Ivan Zakharyaschev <imz@altlinux.org>
    Date:   Sat Jan  9 01:28:50 MSK 2016
      * B2
    
        M ./b -1 +1
    ---- end of already selected patches ----
    Do you want to send these patches? [Yglqk...], or ? for more options: y
    Minimizing context, to send with full context hit ctrl-C...
    File content did not change. Continue anyway? [yn]y
    

    The dependency can be seen in angle brackets in the output:

    [B2
    Ivan Zakharyaschev <imz@altlinux.org>**20160108222850
     Ignore-this: e8693b796cd3cac50bb19f4458ddb323
    ] 
    <
    [A
    Ivan Zakharyaschev <imz@altlinux.org>**20160108222807
     Ignore-this: 613cadd9266dac24e2bcd2dde97d969a
    ] 
    > hunk ./b 1
    -b
    +b2
    

    Here is the full output:

    3 patches for repository /home/imz/tests/test-darcs:
    
    patch 151c8321b2bc36df7ba09dcab0d17c853ed31577
    Author: Ivan Zakharyaschev <imz@altlinux.org>
    Date:   Sat Jan  9 01:28:32 MSK 2016
      * B
    
    patch 1f59d082f61f1fb8d57f5f5199869d1fc21b2435
    Author: Ivan Zakharyaschev <imz@altlinux.org>
    Date:   Sat Jan  9 01:28:07 MSK 2016
      * A
    
    patch f697ac56e8241f5a906c010650b683638944ebf2
    Author: Ivan Zakharyaschev <imz@altlinux.org>
    Date:   Sat Jan  9 01:28:50 MSK 2016
      * B2
    
    New patches:
    
    [B
    Ivan Zakharyaschev <imz@altlinux.org>**20160108222832
     Ignore-this: 9558077a30e30ba3c99003a4418991d
    ] addfile ./b
    hunk ./b 1
    +b
    
    [A
    Ivan Zakharyaschev <imz@altlinux.org>**20160108222807
     Ignore-this: 613cadd9266dac24e2bcd2dde97d969a
    ] addfile ./a
    hunk ./a 1
    +a
    
    [B2
    Ivan Zakharyaschev <imz@altlinux.org>**20160108222850
     Ignore-this: e8693b796cd3cac50bb19f4458ddb323
    ] 
    <
    [A
    Ivan Zakharyaschev <imz@altlinux.org>**20160108222807
     Ignore-this: 613cadd9266dac24e2bcd2dde97d969a
    ] 
    > hunk ./b 1
    -b
    +b2
    
    Context:
    
    Patch bundle hash:
    f7ff61d69da702263b2ac613d3ca979ecab5b07b
    

    Not quite convenient.