##// END OF EJS Templates
rhg: add resolve_file_args to path_utils.rs...
rhg: add resolve_file_args to path_utils.rs Extracted logic for resolving `FILE ...` arguments from cat.rs into a new function in path_utils.rs. I plan to use this for rhg annotate. I tried to reuse hg::utils::files::canonical_path instead, but that didn't work. For example it reports a InsideDotHg error for any path containing "..".

File last commit:

r46506:9dc1351d default
r53438:f33f37ac tip default
Show More
test-add.t
332 lines | 6.5 KiB | text/troff | Tads3Lexer
Nicolas Dumazet
tests: unify test-add
r11795 $ hg init a
$ cd a
$ echo a > a
$ hg add -n
adding a
$ hg st
? a
$ hg add
adding a
$ hg st
A a
$ hg forget a
$ hg add
adding a
Boris Feld
add: add a label for messages about added files...
r39124 $ hg forget a
$ hg add --color debug
Yuya Nishihara
addremove: add "ui." prefix to message color keys...
r40403 [ui.addremove.added ui.status|adding a]
Nicolas Dumazet
tests: unify test-add
r11795 $ hg st
A a
Matt Harbison
context: name files relative to cwd in warning messages...
r33501 $ mkdir dir
$ cd dir
$ hg add ../a
../a already tracked!
$ cd ..
Nicolas Dumazet
tests: unify test-add
r11795
$ echo b > b
$ hg add -n b
$ hg st
A a
? b
Matt Mackall
tests: cleanup exit code handling in unified tests
r12365 $ hg add b
Nicolas Dumazet
tests: unify test-add
r11795 $ hg st
A a
A b
should fail
$ hg add b
b already tracked!
$ hg st
A a
A b
Adrian Buehlmann
test-add: enable for Windows
r16875 #if no-windows
Adrian Buehlmann
add: introduce a warning message for non-portable filenames (issue2756) (BC)...
r13962 $ echo foo > con.xml
$ hg --config ui.portablefilenames=jump add con.xml
Martin von Zweigbergk
errors: raise ConfigError on failure to parse config file...
r46506 config error: ui.portablefilenames value is invalid ('jump')
Martin von Zweigbergk
errors: set detailed exit code to 30 for config errors...
r46445 [30]
Adrian Buehlmann
add: introduce a warning message for non-portable filenames (issue2756) (BC)...
r13962 $ hg --config ui.portablefilenames=abort add con.xml
Augie Fackler
scmutil: use util.shellquote instead of %r...
r33795 abort: filename contains 'con', which is reserved on Windows: con.xml
Martin von Zweigbergk
errors: use InputError for errors about bad paths...
r46448 [10]
Adrian Buehlmann
add: introduce a warning message for non-portable filenames (issue2756) (BC)...
r13962 $ hg st
A a
A b
? con.xml
$ hg add con.xml
Augie Fackler
scmutil: use util.shellquote instead of %r...
r33795 warning: filename contains 'con', which is reserved on Windows: con.xml
Adrian Buehlmann
add: introduce a warning message for non-portable filenames (issue2756) (BC)...
r13962 $ hg st
A a
A b
A con.xml
Mads Kiilerich
tests: use hghave eol-in-paths to test for support for ':' in filenames and " "...
r16974 $ hg forget con.xml
$ rm con.xml
#endif
#if eol-in-paths
Adrian Buehlmann
add: introduce a warning message for non-portable filenames (issue2756) (BC)...
r13962 $ echo bla > 'hello:world'
$ hg --config ui.portablefilenames=abort add
adding hello:world
abort: filename contains ':', which is reserved on Windows: 'hello:world'
Martin von Zweigbergk
errors: use InputError for errors about bad paths...
r46448 [10]
Adrian Buehlmann
add: introduce a warning message for non-portable filenames (issue2756) (BC)...
r13962 $ hg st
A a
A b
? hello:world
$ hg --config ui.portablefilenames=ignore add
adding hello:world
$ hg st
A a
A b
A hello:world
Adrian Buehlmann
test-add: enable for Windows
r16875 #endif
Adrian Buehlmann
add: introduce a warning message for non-portable filenames (issue2756) (BC)...
r13962
Nicolas Dumazet
tests: unify test-add
r11795 $ hg ci -m 0 --traceback
Matt Harbison
revset: fix a crash in parents() when 'wdir()' is in the set...
r25689 $ hg log -r "heads(. or wdir() & file('**'))"
changeset: 0:* (glob)
tag: tip
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: 0
Nicolas Dumazet
tests: unify test-add
r11795 should fail
$ hg add a
a already tracked!
$ echo aa > a
$ hg ci -m 1
$ hg up 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo aaa > a
$ hg ci -m 2
created new head
$ hg merge
merging a
Siddharth Agarwal
simplemerge: move conflict warning message to filemerge...
r26614 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
Nicolas Dumazet
tests: unify test-add
r11795 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
Pulkit Goyal
merge: add `--abort` flag which can abort the merge...
r35722 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
Matt Mackall
tests: add exit codes to unified tests
r12316 [1]
Nicolas Dumazet
tests: unify test-add
r11795 $ hg st
M a
? a.orig
Matt Harbison
revset: fix a crash in parents() when 'wdir()' is in the set...
r25689 wdir doesn't cause a crash, and can be dynamically selected if dirty
$ hg log -r "heads(. or wdir() & file('**'))"
Yuya Nishihara
changeset_printer: display wdirrev/wdirnode values for workingctx...
r25762 changeset: 2147483647:ffffffffffff
Matt Harbison
revset: fix a crash in parents() when 'wdir()' is in the set...
r25689 parent: 2:* (glob)
parent: 1:* (glob)
user: test
date: * (glob)
Nicolas Dumazet
tests: unify test-add
r11795 should fail
$ hg add a
a already tracked!
$ hg st
M a
? a.orig
$ hg resolve -m a
Pierre-Yves David
resolve: add parenthesis around "no more unresolved files" message...
r21947 (no more unresolved files)
Nicolas Dumazet
tests: unify test-add
r11795 $ hg ci -m merge
Martin Geisler
tests: added a short description to issue numbers...
r12399 Issue683: peculiarity with hg revert of an removed then added file
Nicolas Dumazet
tests: unify test-add
r11795
$ hg forget a
$ hg add a
$ hg st
? a.orig
$ hg rm a
$ hg st
R a
? a.orig
$ echo a > a
$ hg add a
$ hg st
M a
? a.orig
Yuya Nishihara
dirstate: drop explicit files that shouldn't match (BC) (issue4679)...
r36218 excluded file shouldn't be added even if it is explicitly specified
$ hg add a.orig -X '*.orig'
$ hg st
M a
? a.orig
Martin von Zweigbergk
add: add back forgotten files even when not matching exactly (BC)...
r23258 Forgotten file can be added back (as either clean or modified)
$ hg forget b
$ hg add b
$ hg st -A b
C b
$ hg forget b
$ echo modified > b
$ hg add b
$ hg st -A b
M b
$ hg revert -qC b
Nicolas Dumazet
tests: unify test-add
r11795 $ hg add c && echo "unexpected addition of missing file"
Mads Kiilerich
tests: hide 'No such file or directory' messages...
r15521 c: * (glob)
Matt Mackall
tests: add exit codes to unified tests
r12316 [1]
Nicolas Dumazet
tests: unify test-add
r11795 $ echo c > c
$ hg add d c && echo "unexpected addition of missing file"
Mads Kiilerich
tests: hide 'No such file or directory' messages...
r15521 d: * (glob)
Matt Mackall
tests: add exit codes to unified tests
r12316 [1]
Nicolas Dumazet
tests: unify test-add
r11795 $ hg st
M a
A c
? a.orig
Siddharth Agarwal
merge: move forgets to the beginning of the action list...
r19987 $ hg up -C
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
forget and get should have the right order: added but missing dir should be
forgotten before file with same name is added
$ echo file d > d
$ hg add d
$ hg ci -md
$ hg rm d
$ mkdir d
$ echo a > d/a
$ hg add d/a
$ rm -r d
$ hg up -C
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cat d
file d
Nicolas Dumazet
tests: unify test-add
r11795
Matt Harbison
dirstate: don't require exact case when adding dirs on icasefs (issue4578)...
r24537 Test that adding a directory doesn't require case matching (issue4578)
#if icasefs
$ mkdir -p CapsDir1/CapsDir
$ echo abc > CapsDir1/CapsDir/AbC.txt
$ mkdir CapsDir1/CapsDir/SubDir
$ echo def > CapsDir1/CapsDir/SubDir/Def.txt
Matt Harbison
match: add a subclass for dirstate normalizing of the matched patterns...
r24790 $ hg add capsdir1/capsdir
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 adding CapsDir1/CapsDir/AbC.txt
adding CapsDir1/CapsDir/SubDir/Def.txt
Matt Harbison
forget: cleanup the output for an inexact case match on icasefs...
r24548
$ hg forget capsdir1/capsdir/abc.txt
Matt Harbison
match: add a subclass for dirstate normalizing of the matched patterns...
r24790
$ hg forget capsdir1/capsdir
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 removing CapsDir1/CapsDir/SubDir/Def.txt
Matt Harbison
match: add a subclass for dirstate normalizing of the matched patterns...
r24790
$ hg add capsdir1
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 adding CapsDir1/CapsDir/AbC.txt
adding CapsDir1/CapsDir/SubDir/Def.txt
Matt Harbison
match: add a subclass for dirstate normalizing of the matched patterns...
r24790
$ hg ci -m "AbCDef" capsdir1/capsdir
$ hg status -A capsdir1/capsdir
C CapsDir1/CapsDir/AbC.txt
C CapsDir1/CapsDir/SubDir/Def.txt
$ hg files capsdir1/capsdir
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 CapsDir1/CapsDir/AbC.txt
CapsDir1/CapsDir/SubDir/Def.txt
Matt Harbison
match: add a subclass for dirstate normalizing of the matched patterns...
r24790
$ echo xyz > CapsDir1/CapsDir/SubDir/Def.txt
$ hg ci -m xyz capsdir1/capsdir/subdir/def.txt
$ hg revert -r '.^' capsdir1/capsdir
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 reverting CapsDir1/CapsDir/SubDir/Def.txt
Matt Harbison
match: add a subclass for dirstate normalizing of the matched patterns...
r24790
Matt Harbison
test-add.t: fix output difference between Windows and OS X (issue4603)
r24807 The conditional tests above mean the hash on the diff line differs on Windows
and OS X
Matt Harbison
match: add a subclass for dirstate normalizing of the matched patterns...
r24790 $ hg diff capsdir1/capsdir
Matt Harbison
test-add.t: fix output difference between Windows and OS X (issue4603)
r24807 diff -r * CapsDir1/CapsDir/SubDir/Def.txt (glob)
Matt Harbison
match: add a subclass for dirstate normalizing of the matched patterns...
r24790 --- a/CapsDir1/CapsDir/SubDir/Def.txt Thu Jan 01 00:00:00 1970 +0000
FUJIWARA Katsunori
tests: make timezone in diff output glob-ed for portability...
r28034 +++ b/CapsDir1/CapsDir/SubDir/Def.txt * (glob)
Matt Harbison
match: add a subclass for dirstate normalizing of the matched patterns...
r24790 @@ -1,1 +1,1 @@
-xyz
+def
Matt Harbison
match: fix a caseonly rename + explicit path commit on icasefs (issue4768)...
r26000 $ hg mv CapsDir1/CapsDir/abc.txt CapsDir1/CapsDir/ABC.txt
$ hg ci -m "case changing rename" CapsDir1/CapsDir/AbC.txt CapsDir1/CapsDir/ABC.txt
$ hg status -A capsdir1/capsdir
M CapsDir1/CapsDir/SubDir/Def.txt
C CapsDir1/CapsDir/ABC.txt
Matt Harbison
match: add a subclass for dirstate normalizing of the matched patterns...
r24790 $ hg remove -f 'glob:**.txt' -X capsdir1/capsdir
$ hg remove -f 'glob:**.txt' -I capsdir1/capsdir
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 removing CapsDir1/CapsDir/ABC.txt
removing CapsDir1/CapsDir/SubDir/Def.txt
Matt Harbison
dirstate: don't require exact case when adding dirs on icasefs (issue4578)...
r24537 #endif
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913 $ cd ..
Sushil khanchi
forget: add --dry-run mode
r36957
test --dry-run mode in forget
$ hg init testdir_forget
$ cd testdir_forget
$ echo foo > foo
$ hg add foo
$ hg commit -m "foo"
$ hg forget foo --dry-run -v
removing foo
$ hg diff
$ hg forget not_exist -n
not_exist: $ENOENT$
[1]
$ cd ..
Sushil khanchi
forget: add --confirm option...
r37774
Sushil khanchi
forget: rename --confirm to --interactive...
r37796 test --interactive mode in forget
Sushil khanchi
forget: add --confirm option...
r37774
Sushil khanchi
forget: rename --confirm to --interactive...
r37796 $ hg init interactiveforget
$ cd interactiveforget
Sushil khanchi
forget: add --confirm option...
r37774 $ echo foo > foo
$ hg commit -qAm "foo"
$ echo bar > bar
$ hg commit -qAm "bar"
Sushil khanchi
forget: rename --confirm to --interactive...
r37796 $ hg forget foo --dry-run -i
abort: cannot specify both --dry-run and --interactive
Martin von Zweigbergk
errors: introduce InputError and use it from commands and cmdutil...
r46431 [10]
Sushil khanchi
forget: add --confirm option...
r37774
Sushil khanchi
forget: rename --confirm to --interactive...
r37796 $ hg forget foo --config ui.interactive=True -i << EOF
Sushil khanchi
forget: add --confirm option...
r37774 > ?
> n
> EOF
forget foo [Ynsa?] ?
y - yes, forget this file
n - no, skip this file
s - skip remaining files
a - include all remaining files
? - ? (display help)
forget foo [Ynsa?] n
Sushil khanchi
forget: rename --confirm to --interactive...
r37796 $ hg forget foo bar --config ui.interactive=True -i << EOF
Sushil khanchi
forget: add --confirm option...
r37774 > y
> n
> EOF
forget bar [Ynsa?] y
forget foo [Ynsa?] n
removing bar
$ hg status
R bar
$ hg up -qC .
Sushil khanchi
forget: rename --confirm to --interactive...
r37796 $ hg forget foo bar --config ui.interactive=True -i << EOF
Sushil khanchi
forget: add --confirm option...
r37774 > s
> EOF
forget bar [Ynsa?] s
$ hg st
$ hg up -qC .
Sushil khanchi
forget: rename --confirm to --interactive...
r37796 $ hg forget foo bar --config ui.interactive=True -i << EOF
Sushil khanchi
forget: add --confirm option...
r37774 > a
> EOF
forget bar [Ynsa?] a
removing bar
removing foo
$ hg status
R bar
R foo
$ hg up -qC .
$ cd ..