sapling/eden/scm/tests/test-record.t

155 lines
3.3 KiB
Perl
Raw Normal View History

#require py2
#chg-compatible
Set up a repo
2010-08-27 18:25:47 +04:00
$ setconfig ui.interactive=true
2010-08-27 18:25:47 +04:00
$ hg init a
$ cd a
Record help
2010-08-27 18:25:47 +04:00
$ hg record -h
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.
2010-08-27 18:25:47 +04:00
See 'hg help dates' for a list of formats valid for -d/--date.
2010-08-27 18:25:47 +04:00
If using the text interface (see 'hg help config'), 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
e - edit this change manually
s - skip remaining changes to this file
f - record remaining changes to this file
2010-08-27 18:25:47 +04:00
d - done, skip remaining changes and files
a - record all changes to all remaining files
q - quit, recording no changes
2010-08-27 18:25:47 +04:00
? - display help
This command is not available when committing a merge.
Options ([+] can be repeated):
2010-08-27 18:25:47 +04:00
help: backout 6f89f03ad369 (mark boolean flags with [no-] in help) for now The ability to negate any boolean flags itself is great, but I think we are not ready to expose the help side of it yet. First, while there exist a handful of such flags whose default value can be changed (eg: git diff, patchwork confirmation), there is only a few of them. The users who benefit the most from this change are alias users and large installation that can deploy extension to change behavior (eg: facebook tweakdefault). So the majority of user who will be affected by a large change to command help that is not yet relevant to them. (I expect this to become relevant when ui.progressive start to exists). Below is an example of the impact of the new help on 'hg help diff': -r --rev REV [+] revision -c --change REV change made by revision -a --[no-]text treat all files as text -g --[no-]git use git extended diff format --[no-]nodates omit dates from diff headers --[no-]noprefix omit a/ and b/ prefixes from filenames -p --[no-]show-function show which function each change is in --[no-]reverse produce a diff that undoes the changes -w --[no-]ignore-all-space ignore white space when comparing lines -b --[no-]ignore-space-change ignore changes in the amount of white space -B --[no-]ignore-blank-lines ignore changes whose lines are all blank -U --unified NUM number of lines of context to show --[no-]stat output diffstat-style summary of changes --root DIR produce diffs relative to subdirectory -I --include PATTERN [+] include names matching the given patterns -X --exclude PATTERN [+] exclude names matching the given patterns -S --[no-]subrepos recurse into subrepositories Another issue with the current state of help, the default value for the flag is not conveyed to the user. For example in the 'backout' help, there is no real distinction between "--[no-]backup" (default to True) and "--[no-]keep" (default) to False: --[no-]backup no backups --[no-]keep do not modify working directory during strip In addition, I've discussed with Augie Fackler and the last batch of the work on this have burned him out quite some. Therefore he is not intending to perform any more work on this topic. Quoting him, he would rather see the help part backed out than spending more time on it. I do not think we are ready to expose this to users in 4.0 (freeze in a week), especially because we cannot expect quick improvement on these aspect as this topic no longer have an owner. We should be able to reintroduce that change in the future when someone get back on it and the main issues are solves: * Introduction of ui.progressive makes it relevant for a majority of user, * Current default value are efficiently conveyed to the user. (In addition, the excerpt from diff help show that we still have some issue with some negative option like '--nodates' so further improvement are probably welcome there.)
2016-10-09 04:11:18 +03:00
-A --addremove mark new/missing files as added/removed before
committing
--amend amend the parent of the working directory
-s --secret use the secret phase for committing
-e --edit invoke editor on commit messages
-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
-Z --ignore-space-at-eol ignore changes in whitespace at EOL
-I --include PATTERN [+] include names matching the given patterns
-X --exclude PATTERN [+] exclude names matching the given patterns
2010-08-27 18:25:47 +04:00
(some details hidden, use --verbose to show complete help)
2010-08-27 18:25:47 +04:00
Select no files
2010-08-27 18:25:47 +04:00
$ touch empty-rw
$ hg add empty-rw
2010-08-27 18:25:47 +04:00
$ hg record empty-rw<<EOF
2010-08-27 18:25:47 +04:00
> n
> EOF
diff --git a/empty-rw b/empty-rw
new file mode 100644
examine changes to 'empty-rw'? [Ynesfdaq?] n
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
no changes to record
[1]
2010-08-27 18:25:47 +04:00
$ hg tip -p
changeset: -1:000000000000
user:
date: Thu Jan 01 00:00:00 1970 +0000
With "copy from"
$ newrepo
$ cat > A << EOF
> 1
> 2
> 3
> EOF
$ hg commit -m A -A A
$ hg mv A B
$ cat > B << EOF
> 0
> 1
> 3
> 5
> EOF
$ hg commit -i -m B << EOS
> y
> n
> y
> y
> EOS
diff --git a/A b/B
rename from A
rename to B
3 hunks, 3 lines changed
examine changes to 'A' and 'B'? [Ynesfdaq?] y
@@ -1,1 +1,2 @@
+0
1
record change 1/3 to 'B'? [Ynesfdaq?] n
@@ -1,3 +2,2 @@
1
-2
3
record change 2/3 to 'B'? [Ynesfdaq?] y
@@ -3,1 +3,2 @@
3
+5
record change 3/3 to 'B'? [Ynesfdaq?] y
'+0' is left not committed:
$ hg log -r . -p -T '{desc}\n' --git
B
diff --git a/A b/B
rename from A
rename to B
--- a/A
+++ b/B
@@ -1,3 +1,3 @@
1
-2
3
+5
$ hg diff --git
diff --git a/B b/B
--- a/B
+++ b/B
@@ -1,3 +1,4 @@
+0
1
3
5