2016-01-08 32 views
0

正如我們所知,可以通過darcs record --ask-deps記錄顯式的補丁依賴關係。 (我看到這樣的用途是防止「It's easy to move a patch that uses a feature to a point before the feature is introduced.」。)如何在darcs中檢查補丁的顯式依賴關係?

因此,有一個回購我應該做出這樣的代價,我想檢查它是否屬實。如何檢查所選補丁的記錄顯式依賴關係?

谷歌可以在Darcs/UI/Commands/Rebase.hs找到我的代碼,如果補丁有這樣的縮寫,會打印一個警告,但是我不知道是否有一個獨立的命令可以提供這些信息(不是耦合到一個動作):

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" 
... 

也許,其輸出.dpatch一個命令將包括在dpatch此信息。我現在應該檢查一下。

根據我的實驗,darcs log -vhttp://bugs.darcs.net/issue959)和darcs diff都沒有輸出此信息。

+1

請注意,在darcs 2.12截至2016年5月有'darcs show dependencies' – IARI

回答

0

一種方法是輸出一個.dpatchdarcs send,並研究它。

這不是一個非常方便的方法,因爲

  1. darcs send需要一個目標回購(即使-o FILE.dpatch);
  2. 幾個補丁進入束,而不是我們要檢查單一個...

下面是一個例子(我也檢查了darcs log -v沒有給出明確的依賴關係的信息):

製備:

$ 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 

記錄顯式依賴性:

$ 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 <[email protected]> 
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' 

檢查的DEPS(我不得不提到一個非相關的darcs回購在 爲了darcs send工作!):

$ 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 <[email protected]> 
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 <[email protected]> 
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 <[email protected]> 
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 <[email protected]> 
Date: Sat Jan 9 01:28:32 MSK 2016 
    * B 

    A ./b 
patch 1f59d082f61f1fb8d57f5f5199869d1fc21b2435 
Author: Ivan Zakharyaschev <[email protected]> 
Date: Sat Jan 9 01:28:07 MSK 2016 
    * A 

    A ./a 
patch f697ac56e8241f5a906c010650b683638944ebf2 
Author: Ivan Zakharyaschev <[email protected]> 
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 

的依賴性可以在尖括號中的輸出中看到:

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

以下是完整的輸出:

3 patches for repository /home/imz/tests/test-darcs: 

patch 151c8321b2bc36df7ba09dcab0d17c853ed31577 
Author: Ivan Zakharyaschev <[email protected]> 
Date: Sat Jan 9 01:28:32 MSK 2016 
    * B 

patch 1f59d082f61f1fb8d57f5f5199869d1fc21b2435 
Author: Ivan Zakharyaschev <[email protected]> 
Date: Sat Jan 9 01:28:07 MSK 2016 
    * A 

patch f697ac56e8241f5a906c010650b683638944ebf2 
Author: Ivan Zakharyaschev <[email protected]> 
Date: Sat Jan 9 01:28:50 MSK 2016 
    * B2 

New patches: 

[B 
Ivan Zakharyaschev <[email protected]>**20160108222832 
Ignore-this: 9558077a30e30ba3c99003a4418991d 
] addfile ./b 
hunk ./b 1 
+b 

[A 
Ivan Zakharyaschev <[email protected]>**20160108222807 
Ignore-this: 613cadd9266dac24e2bcd2dde97d969a 
] addfile ./a 
hunk ./a 1 
+a 

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

Context: 

Patch bundle hash: 
f7ff61d69da702263b2ac613d3ca979ecab5b07b 

不太方便。

相關問題