2010-08-27 18:25:47 +04:00
|
|
|
Create configuration
|
|
|
|
|
|
|
|
$ echo "[ui]" >> $HGRCPATH
|
|
|
|
$ echo "interactive=true" >> $HGRCPATH
|
2011-04-14 12:00:14 +04:00
|
|
|
|
|
|
|
help record (no record)
|
|
|
|
|
|
|
|
$ hg help record
|
2012-06-02 13:28:43 +04:00
|
|
|
record extension - commands to interactively select changes for
|
|
|
|
commit/qrefresh
|
2011-04-14 12:00:14 +04:00
|
|
|
|
2014-08-12 12:18:50 +04:00
|
|
|
(use "hg help extensions" for information on enabling extensions)
|
2011-04-14 12:00:14 +04:00
|
|
|
|
2011-04-14 12:00:15 +04:00
|
|
|
help qrecord (no record)
|
|
|
|
|
|
|
|
$ hg help qrecord
|
|
|
|
'qrecord' is provided by the following extension:
|
|
|
|
|
2012-01-11 21:08:25 +04:00
|
|
|
record commands to interactively select changes for commit/qrefresh
|
2011-04-14 12:00:15 +04:00
|
|
|
|
2014-08-12 12:18:50 +04:00
|
|
|
(use "hg help extensions" for information on enabling extensions)
|
2011-04-14 12:00:15 +04:00
|
|
|
|
2010-08-27 18:25:47 +04:00
|
|
|
$ echo "[extensions]" >> $HGRCPATH
|
|
|
|
$ echo "record=" >> $HGRCPATH
|
|
|
|
|
2011-04-14 12:00:14 +04:00
|
|
|
help record (record)
|
|
|
|
|
|
|
|
$ hg help record
|
|
|
|
hg record [OPTION]... [FILE]...
|
|
|
|
|
|
|
|
interactively select changes to commit
|
|
|
|
|
|
|
|
If a list of files is omitted, all changes reported by "hg status" will be
|
|
|
|
candidates for recording.
|
|
|
|
|
|
|
|
See "hg help dates" for a list of formats valid for -d/--date.
|
|
|
|
|
|
|
|
You will be prompted for whether to record changes to each modified file,
|
|
|
|
and for files with multiple changes, for each change to use. For each
|
|
|
|
query, the following responses are possible:
|
|
|
|
|
|
|
|
y - record this change
|
|
|
|
n - skip this change
|
record: allow splitting of hunks by manually editing patches
It is possible that unrelated changes in a file are on sequential lines. The
current record extension does not allow these to be committed independently.
An example use case for this is in software development for deeply embedded
real-time systems. In these environments, it is not always possible to use a
debugger (due to time-constraints) and hence inline UART-based printing is
often used. When fixing a bug in a module, it is often convenient to add a
large number of 'printf's (linked to the UART via a custom fputc) to the module
in order to work out what is going wrong. printf is a very slow function (and
also variadic so somewhat frowned upon by the MISRA standard) and hence it is
highly undesirable to commit these lines to the repository. If only a partial
fix is implemented, however, it is desirable to commit the fix without deleting
all of the printf lines. This is also simplifies removal of the printf lines
as once the final fix is committed, 'hg revert' does the rest. It is likely
that the printf lines will be very near the actual fix, so being able to split
the hunk is very useful in this case.
There were two alternatives I considered for the user interface. One was to
manually edit the patch, the other to allow a hunk to be split into individual
lines for consideration. The latter option would require a significant
refactor of the record module and is less flexible. While the former is
potentially more complicated to use, this is a feature that is likely to only
be used in certain exceptional cases (such as the use case proposed above) and
hence I felt that the complexity would not be a considerable issue.
I've also written a follow-up patch that refactors the 'prompt' code to base
everything on the choices variable. This tidies up and clarifies the code a
bit (removes constructs like 'if ret == 7' and removes the 'e' option from the
file scope options as it's not relevant there. It's not really a necessity, so
I've excluded it from this submission for now, but I can send it separately if
there's a desire and it's on bitbucket (see below) in the meantime.
Possible future improvements include:
* Tidying up the 'prompt' code to base everything on the choices variable.
This would allow entries to be removed from the prompt as currently 'e' is
offered even for entire file patches, which is currently unsupported.
* Allowing the entire file (or even multi-file) patch to be edited manually:
this would require quite a large refactor without much benefit, so I decided
to exclude it from the initial submission.
* Allow the option to retry if a patch fails to apply (this is what Git does).
This would require quite a bit of refactoring given the current 'hg record'
implementation, so it's debatable whether it's worth it.
Output is similar to existing record user interface except that an additional
option ('e') exists to allow manual editing of the patch. This opens the
user's configured editor with the patch. A comment is added to the bottom of
the patch explaining what to do (based on Git's one).
A large proportion of the changeset is test-case changes to update the options
reported by record (Ynesfdaq? instead of Ynsfdaq?). Functional changes are in
record.py and there are some new test cases in test-record.t.
2012-03-31 01:08:46 +04:00
|
|
|
e - edit this change manually
|
2011-04-14 12:00:14 +04:00
|
|
|
|
|
|
|
s - skip remaining changes to this file
|
|
|
|
f - record remaining changes to this file
|
|
|
|
|
|
|
|
d - done, skip remaining changes and files
|
|
|
|
a - record all changes to all remaining files
|
|
|
|
q - quit, recording no changes
|
|
|
|
|
|
|
|
? - display help
|
|
|
|
|
|
|
|
This command is not available when committing a merge.
|
|
|
|
|
2014-08-12 13:00:42 +04:00
|
|
|
options ([+] can be repeated):
|
2011-04-14 12:00:14 +04:00
|
|
|
|
2011-09-21 22:00:48 +04:00
|
|
|
-A --addremove mark new/missing files as added/removed before
|
|
|
|
committing
|
|
|
|
--close-branch mark a branch as closed, hiding it from the branch
|
|
|
|
list
|
2012-04-18 02:20:16 +04:00
|
|
|
--amend amend the parent of the working dir
|
2013-07-19 01:29:05 +04:00
|
|
|
-s --secret use the secret phase for committing
|
2014-07-29 19:14:52 +04:00
|
|
|
-e --edit invoke editor on commit messages
|
2011-09-21 22:00:48 +04:00
|
|
|
-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
|
2011-10-21 02:33:08 +04:00
|
|
|
-S --subrepos recurse into subrepositories
|
2011-09-21 22:00:48 +04:00
|
|
|
-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
|
2011-04-14 12:00:14 +04:00
|
|
|
|
2014-08-12 12:01:37 +04:00
|
|
|
(some details hidden, use --verbose to show complete help)
|
2011-04-14 12:00:14 +04:00
|
|
|
|
2010-08-27 18:25:47 +04:00
|
|
|
help (no mq, so no qrecord)
|
|
|
|
|
|
|
|
$ hg help qrecord
|
2011-04-14 12:00:15 +04:00
|
|
|
hg qrecord [OPTION]... PATCH [FILE]...
|
|
|
|
|
|
|
|
interactively record a new patch
|
|
|
|
|
|
|
|
See "hg help qnew" & "hg help record" for more information and usage.
|
|
|
|
|
2014-08-12 12:01:37 +04:00
|
|
|
(some details hidden, use --verbose to show complete help)
|
2011-04-14 12:00:15 +04:00
|
|
|
|
|
|
|
$ hg init a
|
|
|
|
|
|
|
|
qrecord (mq not present)
|
|
|
|
|
|
|
|
$ hg -R a qrecord
|
|
|
|
hg qrecord: invalid arguments
|
|
|
|
hg qrecord [OPTION]... PATCH [FILE]...
|
|
|
|
|
|
|
|
interactively record a new patch
|
|
|
|
|
2014-08-12 12:09:26 +04:00
|
|
|
(use "hg qrecord -h" to show more help)
|
2011-04-14 12:00:15 +04:00
|
|
|
[255]
|
|
|
|
|
|
|
|
qrecord patch (mq not present)
|
|
|
|
|
|
|
|
$ hg -R a qrecord patch
|
|
|
|
abort: 'mq' extension not loaded
|
2010-09-17 02:51:32 +04:00
|
|
|
[255]
|
2010-08-27 18:25:47 +04:00
|
|
|
|
2011-05-24 00:09:00 +04:00
|
|
|
help (bad mq)
|
|
|
|
|
2012-08-18 00:58:18 +04:00
|
|
|
$ echo "mq=nonexistent" >> $HGRCPATH
|
2011-05-24 00:09:00 +04:00
|
|
|
$ hg help qrecord
|
2012-12-04 17:35:02 +04:00
|
|
|
*** failed to import extension mq from nonexistent: [Errno *] * (glob)
|
2011-05-24 00:09:00 +04:00
|
|
|
hg qrecord [OPTION]... PATCH [FILE]...
|
|
|
|
|
|
|
|
interactively record a new patch
|
|
|
|
|
|
|
|
See "hg help qnew" & "hg help record" for more information and usage.
|
|
|
|
|
2014-08-12 12:01:37 +04:00
|
|
|
(some details hidden, use --verbose to show complete help)
|
2011-05-24 00:09:00 +04:00
|
|
|
|
2010-08-27 18:25:47 +04:00
|
|
|
help (mq present)
|
|
|
|
|
2012-08-18 00:58:18 +04:00
|
|
|
$ sed 's/mq=nonexistent/mq=/' $HGRCPATH > hgrc.tmp
|
2011-05-24 00:09:00 +04:00
|
|
|
$ mv hgrc.tmp $HGRCPATH
|
|
|
|
|
2010-08-27 18:25:47 +04:00
|
|
|
$ hg help qrecord
|
|
|
|
hg qrecord [OPTION]... PATCH [FILE]...
|
|
|
|
|
|
|
|
interactively record a new patch
|
|
|
|
|
|
|
|
See "hg help qnew" & "hg help record" for more information and usage.
|
|
|
|
|
2014-08-12 13:00:42 +04:00
|
|
|
options ([+] can be repeated):
|
2010-08-27 18:25:47 +04:00
|
|
|
|
2014-07-29 19:14:52 +04:00
|
|
|
-e --edit invoke editor on commit messages
|
2011-09-21 22:00:48 +04:00
|
|
|
-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
|
2010-08-27 18:25:47 +04:00
|
|
|
|
2014-08-12 12:01:37 +04:00
|
|
|
(some details hidden, use --verbose to show complete help)
|
2010-08-27 18:25:47 +04:00
|
|
|
|
|
|
|
$ cd a
|
|
|
|
|
|
|
|
Base commit
|
|
|
|
|
|
|
|
$ cat > 1.txt <<EOF
|
|
|
|
> 1
|
|
|
|
> 2
|
|
|
|
> 3
|
|
|
|
> 4
|
|
|
|
> 5
|
|
|
|
> EOF
|
|
|
|
$ cat > 2.txt <<EOF
|
|
|
|
> a
|
|
|
|
> b
|
|
|
|
> c
|
|
|
|
> d
|
|
|
|
> e
|
|
|
|
> f
|
|
|
|
> EOF
|
|
|
|
|
|
|
|
$ mkdir dir
|
|
|
|
$ cat > dir/a.txt <<EOF
|
|
|
|
> hello world
|
|
|
|
>
|
|
|
|
> someone
|
|
|
|
> up
|
|
|
|
> there
|
|
|
|
> loves
|
|
|
|
> me
|
|
|
|
> EOF
|
|
|
|
|
|
|
|
$ hg add 1.txt 2.txt dir/a.txt
|
|
|
|
$ hg commit -m 'initial checkin'
|
|
|
|
|
|
|
|
Changing files
|
|
|
|
|
|
|
|
$ sed -e 's/2/2 2/;s/4/4 4/' 1.txt > 1.txt.new
|
|
|
|
$ sed -e 's/b/b b/' 2.txt > 2.txt.new
|
|
|
|
$ sed -e 's/hello world/hello world!/' dir/a.txt > dir/a.txt.new
|
|
|
|
|
|
|
|
$ mv -f 1.txt.new 1.txt
|
|
|
|
$ mv -f 2.txt.new 2.txt
|
|
|
|
$ mv -f dir/a.txt.new dir/a.txt
|
|
|
|
|
|
|
|
Whole diff
|
|
|
|
|
|
|
|
$ hg diff --nodates
|
|
|
|
diff -r 1057167b20ef 1.txt
|
|
|
|
--- a/1.txt
|
|
|
|
+++ b/1.txt
|
|
|
|
@@ -1,5 +1,5 @@
|
|
|
|
1
|
|
|
|
-2
|
|
|
|
+2 2
|
|
|
|
3
|
|
|
|
-4
|
|
|
|
+4 4
|
|
|
|
5
|
|
|
|
diff -r 1057167b20ef 2.txt
|
|
|
|
--- a/2.txt
|
|
|
|
+++ b/2.txt
|
|
|
|
@@ -1,5 +1,5 @@
|
|
|
|
a
|
|
|
|
-b
|
|
|
|
+b b
|
|
|
|
c
|
|
|
|
d
|
|
|
|
e
|
|
|
|
diff -r 1057167b20ef dir/a.txt
|
|
|
|
--- a/dir/a.txt
|
|
|
|
+++ b/dir/a.txt
|
|
|
|
@@ -1,4 +1,4 @@
|
|
|
|
-hello world
|
|
|
|
+hello world!
|
|
|
|
|
|
|
|
someone
|
|
|
|
up
|
|
|
|
|
2011-05-24 20:17:02 +04:00
|
|
|
qrecord with bad patch name, should abort before prompting
|
|
|
|
|
|
|
|
$ hg qrecord .hg
|
|
|
|
abort: patch name cannot begin with ".hg"
|
|
|
|
[255]
|
|
|
|
|
2010-08-27 18:25:47 +04:00
|
|
|
qrecord a.patch
|
|
|
|
|
|
|
|
$ hg qrecord -d '0 0' -m aaa a.patch <<EOF
|
|
|
|
> y
|
|
|
|
> y
|
|
|
|
> n
|
|
|
|
> y
|
|
|
|
> y
|
|
|
|
> n
|
|
|
|
> EOF
|
|
|
|
diff --git a/1.txt b/1.txt
|
|
|
|
2 hunks, 2 lines changed
|
2014-10-01 03:04:18 +04:00
|
|
|
examine changes to '1.txt'? [Ynesfdaq?] y
|
|
|
|
|
2010-08-27 18:25:47 +04:00
|
|
|
@@ -1,3 +1,3 @@
|
|
|
|
1
|
|
|
|
-2
|
|
|
|
+2 2
|
|
|
|
3
|
2014-10-01 03:04:18 +04:00
|
|
|
record change 1/4 to '1.txt'? [Ynesfdaq?] y
|
|
|
|
|
2010-08-27 18:25:47 +04:00
|
|
|
@@ -3,3 +3,3 @@
|
|
|
|
3
|
|
|
|
-4
|
|
|
|
+4 4
|
|
|
|
5
|
2014-10-01 03:04:18 +04:00
|
|
|
record change 2/4 to '1.txt'? [Ynesfdaq?] n
|
|
|
|
|
2010-08-27 18:25:47 +04:00
|
|
|
diff --git a/2.txt b/2.txt
|
|
|
|
1 hunks, 1 lines changed
|
2014-10-01 03:04:18 +04:00
|
|
|
examine changes to '2.txt'? [Ynesfdaq?] y
|
|
|
|
|
2010-08-27 18:25:47 +04:00
|
|
|
@@ -1,5 +1,5 @@
|
|
|
|
a
|
|
|
|
-b
|
|
|
|
+b b
|
|
|
|
c
|
|
|
|
d
|
|
|
|
e
|
2014-10-01 03:04:18 +04:00
|
|
|
record change 3/4 to '2.txt'? [Ynesfdaq?] y
|
|
|
|
|
2010-08-27 18:25:47 +04:00
|
|
|
diff --git a/dir/a.txt b/dir/a.txt
|
|
|
|
1 hunks, 1 lines changed
|
2014-10-01 03:04:18 +04:00
|
|
|
examine changes to 'dir/a.txt'? [Ynesfdaq?] n
|
|
|
|
|
2010-08-27 18:25:47 +04:00
|
|
|
|
|
|
|
After qrecord a.patch 'tip'"
|
|
|
|
|
|
|
|
$ hg tip -p
|
|
|
|
changeset: 1:5d1ca63427ee
|
|
|
|
tag: a.patch
|
|
|
|
tag: qbase
|
|
|
|
tag: qtip
|
|
|
|
tag: tip
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: aaa
|
|
|
|
|
|
|
|
diff -r 1057167b20ef -r 5d1ca63427ee 1.txt
|
|
|
|
--- a/1.txt Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/1.txt Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -1,5 +1,5 @@
|
|
|
|
1
|
|
|
|
-2
|
|
|
|
+2 2
|
|
|
|
3
|
|
|
|
4
|
|
|
|
5
|
|
|
|
diff -r 1057167b20ef -r 5d1ca63427ee 2.txt
|
|
|
|
--- a/2.txt Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/2.txt Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -1,5 +1,5 @@
|
|
|
|
a
|
|
|
|
-b
|
|
|
|
+b b
|
|
|
|
c
|
|
|
|
d
|
|
|
|
e
|
|
|
|
|
|
|
|
|
|
|
|
After qrecord a.patch 'diff'"
|
|
|
|
|
|
|
|
$ hg diff --nodates
|
|
|
|
diff -r 5d1ca63427ee 1.txt
|
|
|
|
--- a/1.txt
|
|
|
|
+++ b/1.txt
|
|
|
|
@@ -1,5 +1,5 @@
|
|
|
|
1
|
|
|
|
2 2
|
|
|
|
3
|
|
|
|
-4
|
|
|
|
+4 4
|
|
|
|
5
|
|
|
|
diff -r 5d1ca63427ee dir/a.txt
|
|
|
|
--- a/dir/a.txt
|
|
|
|
+++ b/dir/a.txt
|
|
|
|
@@ -1,4 +1,4 @@
|
|
|
|
-hello world
|
|
|
|
+hello world!
|
|
|
|
|
|
|
|
someone
|
|
|
|
up
|
|
|
|
|
|
|
|
qrecord b.patch
|
|
|
|
|
|
|
|
$ hg qrecord -d '0 0' -m bbb b.patch <<EOF
|
|
|
|
> y
|
|
|
|
> y
|
|
|
|
> y
|
|
|
|
> y
|
|
|
|
> EOF
|
|
|
|
diff --git a/1.txt b/1.txt
|
|
|
|
1 hunks, 1 lines changed
|
2014-10-01 03:04:18 +04:00
|
|
|
examine changes to '1.txt'? [Ynesfdaq?] y
|
|
|
|
|
2010-08-27 18:25:47 +04:00
|
|
|
@@ -1,5 +1,5 @@
|
|
|
|
1
|
|
|
|
2 2
|
|
|
|
3
|
|
|
|
-4
|
|
|
|
+4 4
|
|
|
|
5
|
2014-10-01 03:04:18 +04:00
|
|
|
record change 1/2 to '1.txt'? [Ynesfdaq?] y
|
|
|
|
|
2010-08-27 18:25:47 +04:00
|
|
|
diff --git a/dir/a.txt b/dir/a.txt
|
|
|
|
1 hunks, 1 lines changed
|
2014-10-01 03:04:18 +04:00
|
|
|
examine changes to 'dir/a.txt'? [Ynesfdaq?] y
|
|
|
|
|
2010-08-27 18:25:47 +04:00
|
|
|
@@ -1,4 +1,4 @@
|
|
|
|
-hello world
|
|
|
|
+hello world!
|
|
|
|
|
|
|
|
someone
|
|
|
|
up
|
2014-10-01 03:04:18 +04:00
|
|
|
record change 2/2 to 'dir/a.txt'? [Ynesfdaq?] y
|
|
|
|
|
2010-08-27 18:25:47 +04:00
|
|
|
|
|
|
|
After qrecord b.patch 'tip'
|
|
|
|
|
|
|
|
$ hg tip -p
|
|
|
|
changeset: 2:b056198bf878
|
|
|
|
tag: b.patch
|
|
|
|
tag: qtip
|
|
|
|
tag: tip
|
|
|
|
user: test
|
|
|
|
date: Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
summary: bbb
|
|
|
|
|
|
|
|
diff -r 5d1ca63427ee -r b056198bf878 1.txt
|
|
|
|
--- a/1.txt Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/1.txt Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -1,5 +1,5 @@
|
|
|
|
1
|
|
|
|
2 2
|
|
|
|
3
|
|
|
|
-4
|
|
|
|
+4 4
|
|
|
|
5
|
|
|
|
diff -r 5d1ca63427ee -r b056198bf878 dir/a.txt
|
|
|
|
--- a/dir/a.txt Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
+++ b/dir/a.txt Thu Jan 01 00:00:00 1970 +0000
|
|
|
|
@@ -1,4 +1,4 @@
|
|
|
|
-hello world
|
|
|
|
+hello world!
|
|
|
|
|
|
|
|
someone
|
|
|
|
up
|
|
|
|
|
|
|
|
|
|
|
|
After qrecord b.patch 'diff'
|
|
|
|
|
|
|
|
$ hg diff --nodates
|
2012-06-11 03:40:51 +04:00
|
|
|
|
|
|
|
$ cd ..
|