diff options
Diffstat (limited to 'tests/test-qrecord.t')
| -rw-r--r-- | tests/test-qrecord.t | 94 |
1 files changed, 44 insertions, 50 deletions
diff --git a/tests/test-qrecord.t b/tests/test-qrecord.t index ca218f3..0badb91 100644 --- a/tests/test-qrecord.t +++ b/tests/test-qrecord.t @@ -6,8 +6,7 @@ Create configuration help record (no record) $ hg help record - record extension - commands to interactively select changes for - commit/qrefresh + record extension - commands to interactively select changes for commit/qrefresh use "hg help extensions" for information on enabling extensions @@ -16,7 +15,7 @@ help qrecord (no record) $ hg help qrecord 'qrecord' is provided by the following extension: - record commands to interactively select changes for commit/qrefresh + record commands to interactively select changes for commit/qrefresh use "hg help extensions" for information on enabling extensions @@ -41,7 +40,6 @@ help record (record) y - record this change n - skip this change - e - edit this change manually s - skip remaining changes to this file f - record remaining changes to this file @@ -56,25 +54,23 @@ help record (record) options: - -A --addremove mark new/missing files as added/removed before - committing - --close-branch mark a branch as closed, hiding it from the branch - list - --amend amend the parent of the working dir - -I --include PATTERN [+] include names matching the given patterns - -X --exclude PATTERN [+] exclude names matching the given patterns - -m --message TEXT use text as commit message - -l --logfile FILE read commit message from file - -d --date DATE record the specified date as commit date - -u --user USER record the specified user as committer - -S --subrepos recurse into subrepositories - -w --ignore-all-space ignore white space when comparing lines - -b --ignore-space-change ignore changes in the amount of white space - -B --ignore-blank-lines ignore changes whose lines are all blank + -A --addremove mark new/missing files as added/removed before + committing + --close-branch mark a branch as closed, hiding it from the branch + list + -I --include PATTERN [+] include names matching the given patterns + -X --exclude PATTERN [+] exclude names matching the given patterns + -m --message TEXT use text as commit message + -l --logfile FILE read commit message from file + -d --date DATE record the specified date as commit date + -u --user USER record the specified user as committer + -w --ignore-all-space ignore white space when comparing lines + -b --ignore-space-change ignore changes in the amount of white space + -B --ignore-blank-lines ignore changes whose lines are all blank [+] marked option can be specified multiple times - use "hg -v help record" to show more info + use "hg -v help record" to show global options help (no mq, so no qrecord) @@ -85,7 +81,7 @@ help (no mq, so no qrecord) See "hg help qnew" & "hg help record" for more information and usage. - use "hg -v help qrecord" to show more info + use "hg -v help qrecord" to show global options $ hg init a @@ -110,14 +106,14 @@ help (bad mq) $ echo "mq=nonexistant" >> $HGRCPATH $ hg help qrecord - *** failed to import extension mq from nonexistant: [Errno 2] * (glob) + *** failed to import extension mq from nonexistant: [Errno 2] No such file or directory hg qrecord [OPTION]... PATCH [FILE]... interactively record a new patch See "hg help qnew" & "hg help record" for more information and usage. - use "hg -v help qrecord" to show more info + use "hg -v help qrecord" to show global options help (mq present) @@ -133,24 +129,24 @@ help (mq present) options: - -e --edit edit commit message - -g --git use git extended diff format - -U --currentuser add "From: <current user>" to patch - -u --user USER add "From: <USER>" to patch - -D --currentdate add "Date: <current date>" to patch - -d --date DATE add "Date: <DATE>" to patch - -I --include PATTERN [+] include names matching the given patterns - -X --exclude PATTERN [+] exclude names matching the given patterns - -m --message TEXT use text as commit message - -l --logfile FILE read commit message from file - -w --ignore-all-space ignore white space when comparing lines - -b --ignore-space-change ignore changes in the amount of white space - -B --ignore-blank-lines ignore changes whose lines are all blank - --mq operate on patch repository + -e --edit edit commit message + -g --git use git extended diff format + -U --currentuser add "From: <current user>" to patch + -u --user USER add "From: <USER>" to patch + -D --currentdate add "Date: <current date>" to patch + -d --date DATE add "Date: <DATE>" to patch + -I --include PATTERN [+] include names matching the given patterns + -X --exclude PATTERN [+] exclude names matching the given patterns + -m --message TEXT use text as commit message + -l --logfile FILE read commit message from file + -w --ignore-all-space ignore white space when comparing lines + -b --ignore-space-change ignore changes in the amount of white space + -B --ignore-blank-lines ignore changes whose lines are all blank + --mq operate on patch repository [+] marked option can be specified multiple times - use "hg -v help qrecord" to show more info + use "hg -v help qrecord" to show global options $ cd a @@ -248,22 +244,22 @@ qrecord a.patch > EOF diff --git a/1.txt b/1.txt 2 hunks, 2 lines changed - examine changes to '1.txt'? [Ynesfdaq?] + examine changes to '1.txt'? [Ynsfdaq?] @@ -1,3 +1,3 @@ 1 -2 +2 2 3 - record change 1/4 to '1.txt'? [Ynesfdaq?] + record change 1/4 to '1.txt'? [Ynsfdaq?] @@ -3,3 +3,3 @@ 3 -4 +4 4 5 - record change 2/4 to '1.txt'? [Ynesfdaq?] + record change 2/4 to '1.txt'? [Ynsfdaq?] diff --git a/2.txt b/2.txt 1 hunks, 1 lines changed - examine changes to '2.txt'? [Ynesfdaq?] + examine changes to '2.txt'? [Ynsfdaq?] @@ -1,5 +1,5 @@ a -b @@ -271,10 +267,10 @@ qrecord a.patch c d e - record change 3/4 to '2.txt'? [Ynesfdaq?] + record change 3/4 to '2.txt'? [Ynsfdaq?] diff --git a/dir/a.txt b/dir/a.txt 1 hunks, 1 lines changed - examine changes to 'dir/a.txt'? [Ynesfdaq?] + examine changes to 'dir/a.txt'? [Ynsfdaq?] After qrecord a.patch 'tip'" @@ -343,7 +339,7 @@ qrecord b.patch > EOF diff --git a/1.txt b/1.txt 1 hunks, 1 lines changed - examine changes to '1.txt'? [Ynesfdaq?] + examine changes to '1.txt'? [Ynsfdaq?] @@ -1,5 +1,5 @@ 1 2 2 @@ -351,17 +347,17 @@ qrecord b.patch -4 +4 4 5 - record change 1/2 to '1.txt'? [Ynesfdaq?] + record change 1/2 to '1.txt'? [Ynsfdaq?] diff --git a/dir/a.txt b/dir/a.txt 1 hunks, 1 lines changed - examine changes to 'dir/a.txt'? [Ynesfdaq?] + examine changes to 'dir/a.txt'? [Ynsfdaq?] @@ -1,4 +1,4 @@ -hello world +hello world! someone up - record change 2/2 to 'dir/a.txt'? [Ynesfdaq?] + record change 2/2 to 'dir/a.txt'? [Ynsfdaq?] After qrecord b.patch 'tip' @@ -398,5 +394,3 @@ After qrecord b.patch 'tip' After qrecord b.patch 'diff' $ hg diff --nodates - - $ cd .. |