Commit Graph

104 Commits

Author SHA1 Message Date
Jason Orendorff
1b4f863a3f mq: qdiff: support all diffopts 2008-06-12 07:38:15 -05:00
Matt Mackall
edf5a0f5d0 resolve: new command
- add basic resolve command functionality
- point failed update and merge at resolve
2008-04-11 12:52:56 -05:00
Patrick Mezard
2a9d095734 Merge with crew-stable 2008-04-04 22:18:38 +02:00
Patrick Mezard
8e0cbccd26 Let --unified default to diff.unified (issue 1076) 2008-04-04 22:15:14 +02:00
Christian Ebert
2da59c83a3 Consistently 1 space after full stops in command doc strings
Update test output accordingly.
2008-04-02 14:03:16 +02:00
John Coomes
7b1227d192 tag: allow multiple tags to be added or removed
- Example:  "hg tag -r 42 build-25 beta-1" will add tags build-25 and beta-1
  for rev 42.
- The deprecated and undocumented usage "hg tag arg1 arg2" used to emit a
  warning, then add tag arg1 for rev arg2 (equivalent to "hg tag -r arg2 arg1").
  It will now add tags arg1 and arg2 for the current revision.
- If one tag triggers an error, no tags are added/removed (all or nothing).
2008-03-14 15:38:56 -07:00
Thomas Arendsen Hein
d659d68d7a Extend/correct f488b5acd598 regarding -qA and ignored files.
hg status -qA will now hide untracked files as described in the doc string.
2008-03-02 13:52:34 +01:00
Zoran Bosnjak
ddaa8e2b8b 'hg status -q' output skips non-tracked files.
The '-q' flag was ignored in status command. But this flag
can be used to hide non-tracked files in hg status output.
This small correction makes status command more general,
similar to 'svn status', where '-q' flag has the same effect.

The '-u' and '-A' flags have priority over '-q'.

A testcase and doc-string for status was extended to cover
'-q' flag.
2008-03-01 22:30:03 +01:00
Bryan O'Sullivan
4a012ef2b9 Merge with crew 2008-02-06 19:57:52 -08:00
Thomas Arendsen Hein
73a0d43985 Clarify help for hg status and make it consistent. 2008-02-02 14:49:31 +01:00
Thomas Arendsen Hein
35cbed7baa Move aliases section in help below synopsis (issue362)
This should avoid confusion why e.g. "hg help co" shows help
for "hg update" instead.
2008-01-02 20:22:10 +01:00
Matt Mackall
bee8b54b36 bisect: make bisect a built-in command 2007-12-31 18:20:34 -06:00
Matt Mackall
62cb860a38 Backed out changeset f019d9201ff4
Unfortunately, this breaks backward compatibility.
2007-12-31 17:47:02 -06:00
Thomas Arendsen Hein
2be743c9ed "C" status code considered harmful, so changed to "=" (issue899)
C means conflict in other SCMs, and = is more intuitive anyway.
2007-12-30 17:45:26 +01:00
Matt Mackall
2e547ddf4b doc: add repo/ to .hgignore and .hgtags
These names were disappearing in the asciidoc output and no form of
escaping seems to help. Let's just add repo/ to make it explicit that
they're in the repository root.
2007-12-02 15:52:36 -06:00
jorendorff@mozilla.com
c3848517a7 commands.py, patch.py: add -U option to hg diff command 2007-07-26 07:56:04 -04:00
Giorgos Keramidas
5f8125a5a3 unbundle: accept multiple file arguments
update test-bundle for multiple unbundle support
2007-06-24 10:08:38 -05:00
Matt Mackall
a0395f3952 identify: accept a revision argument 2007-06-21 11:54:11 -05:00
Alexis S. L. Carvalho
2bdde5e379 update the output of test-help and test-globalopts 2007-06-21 00:34:14 -03:00
Alexis S. L. Carvalho
8e9491052e Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output
This should make it easier to discover global options.

As a bonus, they are no longer displayed by something like a
hg -v help dates
2007-04-07 04:27:55 -03:00
Thomas Arendsen Hein
1de135fc65 Fix help text for hg status -i 2007-03-06 12:52:07 +01:00
Benoit Boissinot
9b95329263 various doc fixes
- update can no longer be used to merge
- short summary start with lowercase
- add merge to short help list
- fix tests
2006-12-29 06:37:43 +01:00
Thomas Arendsen Hein
c72030a3d2 Adjust test-help output for the change in 28dd65def6cd. 2006-12-16 23:33:24 +01:00
Thomas Arendsen Hein
fb1cbb4570 doc string fix: hg cat and manifest default to current parent revision. 2006-12-16 22:33:39 +01:00
Thomas Arendsen Hein
429e98a404 Corrected synopsis for many commands.
Use CMD instead of FILE for -e and --remotecmd (thanks, Neal Becker)
2006-12-14 19:30:18 +01:00
Matt Mackall
a32d76f358 Add doc notes about revert and hg status vs diff 2006-12-08 14:55:45 -06:00
Matt Mackall
afebc36749 add branch and branches commands 2006-10-24 16:49:36 -05:00
Alexis S. L. Carvalho
bb1e7c9b30 Update tests output 2006-10-18 18:44:23 -03:00
Thomas Arendsen Hein
1b2caf3f19 Un-debugify debugconfig to showconfig. (issue 317) 2006-10-05 15:51:54 +02:00
Stephen Darnell
87280e847b Remove single character equivalent of --nodates (was -D) 2006-09-28 21:00:01 +01:00
Stephen Darnell
a808384cf1 Add -D/--nodates options to hg diff/export that removes dates from diff headers
and replace uses of sed in the tests with --nodates.
2006-09-26 00:05:24 +01:00
Thomas Arendsen Hein
d3fc1dadc1 Documentation fixes for addremove.
- It is no longer deprecated, but the short help still included (DEPRECATED).
- Similarity parameter has to be 0<=s<=100 and not 0<=s<=1.
2006-09-27 21:43:45 +02:00
Vadim Gelfer
5a993ee589 merge. 2006-08-18 21:17:28 -07:00
Brendan Cully
c18265f47c Add diff --git option 2006-08-14 22:48:03 -07:00
Vadim Gelfer
61cd2f1088 addremove: do not deprecate.
command is too useful to drop.
is also best place to try autodetect of rename/copy by content similarity.
2006-07-23 09:04:14 -07:00
Vadim Gelfer
9738466350 status: add -c (clean) and -A (all files) options
also add new localrepo.status what is more uniform than localrepo.changes.
localrepo.changes is deprecated and will go away soon.
2006-07-20 16:21:07 -07:00
Vadim Gelfer
c70a1efd28 fix tests. 2006-07-19 07:56:40 -07:00
Haakon Riiser
7b06333d1a diff: add -b/-B options 2006-06-29 15:16:25 +02:00
Vadim Gelfer
4538f9a28f help: make "hg help EXTENSION" work 2006-07-03 14:30:24 -07:00
Vadim Gelfer
c2a4ad5200 update test-help output after new options. 2006-06-09 09:14:52 -07:00
Vadim Gelfer
79f11ff2dd hide deprecated undo command by making it an alias for debugundo. 2006-05-09 20:56:13 -07:00
Vadim Gelfer
0401f2bd35 fix test-help output. 2006-05-08 14:18:19 -07:00
Thomas Arendsen Hein
9be2b594a2 Fixed tests for changed help output 2006-05-06 16:43:16 +02:00
Vadim Gelfer
9522c700f4 revert: remove word "modified" from description. 2006-05-05 11:07:29 -07:00
Vadim Gelfer
9c9dc84168 update test-help.out after fixing revert docs. 2006-05-04 15:25:24 -07:00
Thomas Arendsen Hein
dc3e204fa1 Add debugaddremove alias to addremove, so it doesn't show up in 'hg help'.
Add an explicit description of 'hg commit --addremove'.
2006-05-03 10:53:51 +02:00
Vadim Gelfer
6e0d4ab1da deprecate addremove command. 2006-05-02 21:50:53 -07:00
Vadim Gelfer
1975d41da8 add backout command.
command undoes effect of an earlier commit, commits new changeset
as result.
2006-04-29 20:56:46 -07:00
Thomas Arendsen Hein
995ddadce4 Make the deprecated forget an alias of debugforget.
This way it doesn't show up in the non-debug help.
2006-04-27 13:11:23 +02:00
Vadim Gelfer
184aae8b48 mark forget command as deprecated.
will be removed after 0.9 released.
2006-04-26 12:05:16 -07:00