Commit Graph

1685 Commits

Author SHA1 Message Date
Ori Avtalion
47c45630d8 Fix hg heads -r flag documentation
The command arguments are "[-ac] [-r STARTREV] [REV]..."
2010-05-15 00:34:07 +03:00
Ori Avtalion
1addb571c7 Fix wording in hg pull documentation 2010-05-14 22:29:15 +03:00
Matt Mackall
a02b5a5fd1 commands: initial audit of exit codes
bisect: clarify None return
bundle: return 1 on no changes
clone: return result code
copy: limit errors to 0/1
commit: return 1 on no changes
forget: return 1 on errors
grep: return 1 if no match found
remove: return 1 on errors
resolve: return 1 if something fails to resolve
rollback: return 1 if no rollback data
2010-05-15 17:48:49 -05:00
Matt Mackall
e3ad4f8b46 commit: note new branch heads rather than topological heads
Move to using contexts while we're at it.
2010-05-13 17:24:21 -05:00
Matt Mackall
1748ffa6dd tag: strip whitespace from tag names (issue2174) 2010-05-12 15:40:58 -05:00
Gilles Moris
e35d01d1d4 summary: show if commit will be from a closed head 2010-05-10 22:44:06 +02:00
Gilles Moris
899149fc0b commit: inform the commiter when resurrecting a closed changeset 2010-05-10 08:53:06 +02:00
Gilles Moris
a444a7f860 commit: prevent closing non-head changesets 2010-05-10 08:43:36 +02:00
Martin Geisler
a44b1e166b Merge with stable 2010-05-07 17:03:48 +02:00
Martin Geisler
0f12cdee49 commands: explain that "hg serve" does not do authentication 2010-05-07 17:03:31 +02:00
Martin Geisler
03fe3d3627 commands: explain that "hg serve" is mostly for ad-hoc sharing 2010-05-07 17:01:14 +02:00
Brendan Cully
9a40d342ae Merge with main 2010-05-03 15:28:04 -07:00
Brendan Cully
1efcfabe26 Merge with stable 2010-05-03 15:27:05 -07:00
Brendan Cully
4d11a5bfea grep: clarify help for -r 2010-05-03 15:22:47 -07:00
Matt Mackall
1d338ff2d8 summary: add subrepo status 2010-05-03 17:05:23 -05:00
Matt Mackall
7f6aa6252c Merge with stable 2010-05-01 15:15:35 -05:00
Matt Mackall
53ab4498e1 subrepo: propagate and catch push failures 2010-04-30 18:32:18 -05:00
Nicolas Dumazet
22fdcb45f3 tag: warn users about tag/branch possible name conflicts
As reported recently, Mercurial users can easily find confusion when
using a common name for a tag and a branch. It seems reasonable to warn
them about this potential outcome, to avoid that "surprise".
* Explain briefly the issue in "hg help tag"
* Warn when tagging a revision
2010-04-19 17:41:12 +09:00
Faheem Mitha
a231e38798 commands: revised documentation of 'default' and 'default-push'
This patch was a collaborative effort between faheem, mg, timeless and
ilowe.
2010-04-27 00:44:06 +05:30
Yuya Nishihara
539b379b8c log: add --stat for diffstat output
log --stat shows diffstat in place of patch output.
2010-04-01 00:35:12 +09:00
Yuya Nishihara
e1d422d1b5 commands: refactor diff --stat and qdiff --stat
`opts['unified'] = '0'` can be replaced by `diffopts.context = 0`.
2010-04-07 00:45:20 +09:00
Mads Kiilerich
d0cbf08541 showconfig: show rc paths with --debug 2010-04-26 15:32:23 +02:00
Martin Geisler
75b52a4dce commands: better markup in "hg help paths" 2010-04-26 21:35:09 +02:00
Martin Geisler
11c192e04a Merge with stable 2010-04-26 21:32:46 +02:00
Matt Mackall
0439497509 hgweb: unify hgweb calls in serve 2010-04-26 11:03:40 -05:00
Matt Mackall
7443b42ff2 serve: webdir_conf -> webconf 2010-04-26 11:03:40 -05:00
Matt Mackall
3fea1c3bdd hgweb: make baseui parameter non-positional 2010-04-26 11:03:40 -05:00
Martin Geisler
f1853c5e82 Use hg role in help strings 2010-04-22 10:24:49 +02:00
Benoit Boissinot
e196c3bc8f log -b: use opts.get() instead of assuming opts is correctly filled 2010-04-20 01:08:20 +02:00
Matt Mackall
399ebe1c0f Merge with stable 2010-04-19 17:00:02 -05:00
Steve Losh
8551e0d0f2 commands: add more robust support for 'hg log -b' (issue2078)
Fixes issue2078 and adds tests to cover various 'hg log -b' uses.

This change adds a localrepo.lookupbranch(key, remote=None) function. This
will look up the branch of the revision with the given key. The algorithm
works like this:

    * If a remote repo is given and KEY is the name of a branch in that repo,
      return KEY.
    * If no remote repo is given and KEY is the name of a branch in the local
      repo object, return KEY.
    * Otherwise look up the revision with the identifier KEY in the local repo
      and return its branch.

This change also makes 'hg log -b' use this new functionality and adds a few
tests for it.
2010-04-12 19:33:25 -04:00
Matt Mackall
28f56d970a debugcomplete: don't list deprecated options 2010-04-19 16:47:44 -05:00
Steve Losh
6a47111c36 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Switching to --branch makes log consistent with push/pull and make more sense
given the actual behavior of the option (you can specify -b multiple times to
include multiple branches).

This change also adds some tests for 'hg log -b'.
2010-04-18 18:18:19 -04:00
Martin Geisler
5b1e19c3e0 Merge with stable 2010-04-16 22:14:14 +02:00
Faheem Mitha
d7c81ab4be Document 'default' and 'default-push' in paths docstring 2010-04-14 11:59:53 +05:30
Matt Mackall
25e5344b4e commands: improve some command summaries 2010-04-11 14:24:19 -05:00
Steve Borho
8299cbf24b rollback: add dry-run argument, emit transaction description 2010-04-09 17:23:37 -05:00
Martin Geisler
99b9cdb84f commands: leftover from 81707f241814 2010-04-05 13:44:30 +02:00
Martin Geisler
7b10bfabe8 commands: small refactoring in summary 2010-04-05 11:58:54 +02:00
Martin Geisler
00833c6af1 commands: retrieve tags from context object 2010-04-05 11:52:40 +02:00
Eric Eisner
2f5c879650 summary: make use of output labeling
The individual pieces of information use the same labels as the commands
they summarize for better cohesion of commands.
2010-04-04 21:35:00 -04:00
Martin Geisler
e3fc3eac98 commands: fix typo 2010-04-05 01:31:16 +02:00
Brodie Rao
e504a56477 diff: make use of output labeling 2010-04-02 15:22:06 -05:00
Brodie Rao
23d97750d1 status: make use of output labeling 2010-04-02 15:22:05 -05:00
Brodie Rao
94af2427db grep: make use of output labeling 2010-04-02 15:22:03 -05:00
Dan Villiom Podlaski Christiansen
b9377254d9 diffstat: use ui.plain() instead of ui.interactive()
Previously, a default width of 80 is used for non-interactive
sessions. This behaviour was introduced before HGPLAIN was supported.
2010-04-15 18:52:59 +02:00
Martin Geisler
4448069a13 commands: remove extra indentation from list in help text 2010-03-11 14:56:15 +01:00
timeless
3e27f0b8c3 commands: document and test hg clone update priority 2010-03-11 10:06:01 +02:00
Benoit Boissinot
65a86e1b8e bundle: fix bundle generation for empty changegroup 2010-03-09 20:38:23 +01:00
Benoit Boissinot
b1e6cef961 any is not available for python2.4 2010-03-11 19:09:35 +01:00