mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
285680e0f0
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.
356 lines
7.9 KiB
Turing
356 lines
7.9 KiB
Turing
$ echo "[ui]" >> $HGRCPATH
|
|
$ echo "commitsubrepos = Yes" >> $HGRCPATH
|
|
$ echo "[extensions]" >> $HGRCPATH
|
|
$ echo "mq=" >> $HGRCPATH
|
|
$ echo "record=" >> $HGRCPATH
|
|
$ echo "[diff]" >> $HGRCPATH
|
|
$ echo "nodates=1" >> $HGRCPATH
|
|
|
|
$ stdin=`pwd`/stdin.tmp
|
|
|
|
fn to create new repository w/dirty subrepo, and cd into it
|
|
$ mkrepo() {
|
|
> hg init $1
|
|
> cd $1
|
|
> hg qinit
|
|
> }
|
|
|
|
fn to create dirty subrepo
|
|
$ mksubrepo() {
|
|
> hg init $1
|
|
> cd $1
|
|
> echo a > a
|
|
> hg add
|
|
> cd ..
|
|
> }
|
|
|
|
$ testadd() {
|
|
> cat - > "$stdin"
|
|
> mksubrepo sub
|
|
> echo sub = sub >> .hgsub
|
|
> hg add .hgsub
|
|
> echo % abort when adding .hgsub w/dirty subrepo
|
|
> hg status -S
|
|
> echo '%' $*
|
|
> cat "$stdin" | hg $*
|
|
> echo [$?]
|
|
> hg -R sub ci -m0sub
|
|
> echo % update substate when adding .hgsub w/clean updated subrepo
|
|
> hg status -S
|
|
> echo '%' $*
|
|
> cat "$stdin" | hg $*
|
|
> hg debugsub
|
|
> }
|
|
|
|
$ testmod() {
|
|
> cat - > "$stdin"
|
|
> mksubrepo sub2
|
|
> echo sub2 = sub2 >> .hgsub
|
|
> echo % abort when modifying .hgsub w/dirty subrepo
|
|
> hg status -S
|
|
> echo '%' $*
|
|
> cat "$stdin" | hg $*
|
|
> echo [$?]
|
|
> hg -R sub2 ci -m0sub2
|
|
> echo % update substate when modifying .hgsub w/clean updated subrepo
|
|
> hg status -S
|
|
> echo '%' $*
|
|
> cat "$stdin" | hg $*
|
|
> hg debugsub
|
|
> }
|
|
|
|
$ testrm1() {
|
|
> cat - > "$stdin"
|
|
> mksubrepo sub3
|
|
> echo sub3 = sub3 >> .hgsub
|
|
> hg ci -Aqmsub3
|
|
> $EXTRA
|
|
> echo b >> sub3/a
|
|
> hg rm .hgsub
|
|
> echo % update substate when removing .hgsub w/dirty subrepo
|
|
> hg status -S
|
|
> echo '%' $*
|
|
> cat "$stdin" | hg $*
|
|
> echo % debugsub should be empty
|
|
> hg debugsub
|
|
> }
|
|
|
|
$ testrm2() {
|
|
> cat - > "$stdin"
|
|
> mksubrepo sub4
|
|
> echo sub4 = sub4 >> .hgsub
|
|
> hg ci -Aqmsub4
|
|
> $EXTRA
|
|
> hg rm .hgsub
|
|
> echo % update substate when removing .hgsub w/clean updated subrepo
|
|
> hg status -S
|
|
> echo '%' $*
|
|
> cat "$stdin" | hg $*
|
|
> echo % debugsub should be empty
|
|
> hg debugsub
|
|
> }
|
|
|
|
|
|
handle subrepos safely on qnew
|
|
|
|
$ mkrepo repo-2499-qnew
|
|
$ testadd qnew -m0 0.diff
|
|
adding a
|
|
% abort when adding .hgsub w/dirty subrepo
|
|
A .hgsub
|
|
A sub/a
|
|
% qnew -m0 0.diff
|
|
abort: uncommitted changes in subrepository sub
|
|
[255]
|
|
% update substate when adding .hgsub w/clean updated subrepo
|
|
A .hgsub
|
|
% qnew -m0 0.diff
|
|
path sub
|
|
source sub
|
|
revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
|
|
|
|
$ testmod qnew -m1 1.diff
|
|
adding a
|
|
% abort when modifying .hgsub w/dirty subrepo
|
|
M .hgsub
|
|
A sub2/a
|
|
% qnew -m1 1.diff
|
|
abort: uncommitted changes in subrepository sub2
|
|
[255]
|
|
% update substate when modifying .hgsub w/clean updated subrepo
|
|
M .hgsub
|
|
% qnew -m1 1.diff
|
|
path sub
|
|
source sub
|
|
revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
|
|
path sub2
|
|
source sub2
|
|
revision 1f94c7611cc6b74f5a17b16121a1170d44776845
|
|
|
|
$ hg qpop -qa
|
|
patch queue now empty
|
|
$ testrm1 qnew -m2 2.diff
|
|
adding a
|
|
% update substate when removing .hgsub w/dirty subrepo
|
|
M sub3/a
|
|
R .hgsub
|
|
% qnew -m2 2.diff
|
|
% debugsub should be empty
|
|
|
|
$ hg qpop -qa
|
|
patch queue now empty
|
|
$ testrm2 qnew -m3 3.diff
|
|
adding a
|
|
% update substate when removing .hgsub w/clean updated subrepo
|
|
R .hgsub
|
|
% qnew -m3 3.diff
|
|
% debugsub should be empty
|
|
|
|
$ cd ..
|
|
|
|
|
|
handle subrepos safely on qrefresh
|
|
|
|
$ mkrepo repo-2499-qrefresh
|
|
$ hg qnew -m0 0.diff
|
|
$ testadd qrefresh
|
|
adding a
|
|
% abort when adding .hgsub w/dirty subrepo
|
|
A .hgsub
|
|
A sub/a
|
|
% qrefresh
|
|
abort: uncommitted changes in subrepository sub
|
|
[255]
|
|
% update substate when adding .hgsub w/clean updated subrepo
|
|
A .hgsub
|
|
% qrefresh
|
|
path sub
|
|
source sub
|
|
revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
|
|
|
|
$ hg qnew -m1 1.diff
|
|
$ testmod qrefresh
|
|
adding a
|
|
% abort when modifying .hgsub w/dirty subrepo
|
|
M .hgsub
|
|
A sub2/a
|
|
% qrefresh
|
|
abort: uncommitted changes in subrepository sub2
|
|
[255]
|
|
% update substate when modifying .hgsub w/clean updated subrepo
|
|
M .hgsub
|
|
% qrefresh
|
|
path sub
|
|
source sub
|
|
revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
|
|
path sub2
|
|
source sub2
|
|
revision 1f94c7611cc6b74f5a17b16121a1170d44776845
|
|
|
|
$ hg qpop -qa
|
|
patch queue now empty
|
|
$ EXTRA='hg qnew -m2 2.diff'
|
|
$ testrm1 qrefresh
|
|
adding a
|
|
% update substate when removing .hgsub w/dirty subrepo
|
|
M sub3/a
|
|
R .hgsub
|
|
% qrefresh
|
|
% debugsub should be empty
|
|
|
|
$ hg qpop -qa
|
|
patch queue now empty
|
|
$ EXTRA='hg qnew -m3 3.diff'
|
|
$ testrm2 qrefresh
|
|
adding a
|
|
% update substate when removing .hgsub w/clean updated subrepo
|
|
R .hgsub
|
|
% qrefresh
|
|
% debugsub should be empty
|
|
$ EXTRA=
|
|
|
|
$ cd ..
|
|
|
|
|
|
handle subrepos safely on qpush/qpop
|
|
|
|
$ mkrepo repo-2499-qpush
|
|
$ mksubrepo sub
|
|
adding a
|
|
$ hg -R sub ci -m0sub
|
|
$ echo sub = sub > .hgsub
|
|
$ hg add .hgsub
|
|
$ hg qnew -m0 0.diff
|
|
$ hg debugsub
|
|
path sub
|
|
source sub
|
|
revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
|
|
|
|
qpop
|
|
$ hg qpop
|
|
popping 0.diff
|
|
patch queue now empty
|
|
$ hg status -AS
|
|
$ hg debugsub
|
|
|
|
qpush
|
|
$ hg qpush
|
|
applying 0.diff
|
|
now at: 0.diff
|
|
$ hg status -AS
|
|
C .hgsub
|
|
C .hgsubstate
|
|
C sub/a
|
|
$ hg debugsub
|
|
path sub
|
|
source sub
|
|
revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
|
|
|
|
$ cd ..
|
|
|
|
|
|
handle subrepos safely on qrecord
|
|
|
|
$ mkrepo repo-2499-qrecord
|
|
$ testadd qrecord --config ui.interactive=1 -m0 0.diff <<EOF
|
|
> y
|
|
> y
|
|
> EOF
|
|
adding a
|
|
% abort when adding .hgsub w/dirty subrepo
|
|
A .hgsub
|
|
A sub/a
|
|
% qrecord --config ui.interactive=1 -m0 0.diff
|
|
diff --git a/.hgsub b/.hgsub
|
|
new file mode 100644
|
|
examine changes to '.hgsub'? [Ynesfdaq?]
|
|
abort: uncommitted changes in subrepository sub
|
|
[255]
|
|
% update substate when adding .hgsub w/clean updated subrepo
|
|
A .hgsub
|
|
% qrecord --config ui.interactive=1 -m0 0.diff
|
|
diff --git a/.hgsub b/.hgsub
|
|
new file mode 100644
|
|
examine changes to '.hgsub'? [Ynesfdaq?]
|
|
path sub
|
|
source sub
|
|
revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
|
|
|
|
$ testmod qrecord --config ui.interactive=1 -m1 1.diff <<EOF
|
|
> y
|
|
> y
|
|
> EOF
|
|
adding a
|
|
% abort when modifying .hgsub w/dirty subrepo
|
|
M .hgsub
|
|
A sub2/a
|
|
% qrecord --config ui.interactive=1 -m1 1.diff
|
|
diff --git a/.hgsub b/.hgsub
|
|
1 hunks, 1 lines changed
|
|
examine changes to '.hgsub'? [Ynesfdaq?]
|
|
@@ -1,1 +1,2 @@
|
|
sub = sub
|
|
+sub2 = sub2
|
|
record this change to '.hgsub'? [Ynesfdaq?]
|
|
abort: uncommitted changes in subrepository sub2
|
|
[255]
|
|
% update substate when modifying .hgsub w/clean updated subrepo
|
|
M .hgsub
|
|
% qrecord --config ui.interactive=1 -m1 1.diff
|
|
diff --git a/.hgsub b/.hgsub
|
|
1 hunks, 1 lines changed
|
|
examine changes to '.hgsub'? [Ynesfdaq?]
|
|
@@ -1,1 +1,2 @@
|
|
sub = sub
|
|
+sub2 = sub2
|
|
record this change to '.hgsub'? [Ynesfdaq?]
|
|
path sub
|
|
source sub
|
|
revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31
|
|
path sub2
|
|
source sub2
|
|
revision 1f94c7611cc6b74f5a17b16121a1170d44776845
|
|
|
|
$ hg qpop -qa
|
|
patch queue now empty
|
|
$ testrm1 qrecord --config ui.interactive=1 -m2 2.diff <<EOF
|
|
> y
|
|
> y
|
|
> EOF
|
|
adding a
|
|
% update substate when removing .hgsub w/dirty subrepo
|
|
M sub3/a
|
|
R .hgsub
|
|
% qrecord --config ui.interactive=1 -m2 2.diff
|
|
diff --git a/.hgsub b/.hgsub
|
|
deleted file mode 100644
|
|
examine changes to '.hgsub'? [Ynesfdaq?]
|
|
% debugsub should be empty
|
|
|
|
$ hg qpop -qa
|
|
patch queue now empty
|
|
$ testrm2 qrecord --config ui.interactive=1 -m3 3.diff <<EOF
|
|
> y
|
|
> y
|
|
> EOF
|
|
adding a
|
|
% update substate when removing .hgsub w/clean updated subrepo
|
|
R .hgsub
|
|
% qrecord --config ui.interactive=1 -m3 3.diff
|
|
diff --git a/.hgsub b/.hgsub
|
|
deleted file mode 100644
|
|
examine changes to '.hgsub'? [Ynesfdaq?]
|
|
% debugsub should be empty
|
|
|
|
$ cd ..
|
|
|
|
|
|
correctly handle subrepos with patch queues
|
|
$ mkrepo repo-subrepo-with-queue
|
|
$ mksubrepo sub
|
|
adding a
|
|
$ hg -R sub qnew sub0.diff
|
|
$ echo sub = sub >> .hgsub
|
|
$ hg add .hgsub
|
|
$ hg qnew 0.diff
|