facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 07:49:11 +03:00
Code Issues Projects Releases Wiki Activity
11,481 Commits 24 Branches 62 Tags 322 MiB
631c3ba3c4
Commit Graph

1718 Commits

Author SHA1 Message Date
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
Benoit Boissinot
3db7df2869 style: use consistent variable names (*mod) with imports which would shadow 2010-03-11 17:43:44 +01:00
David Wolever
d9d667c78e archive: autodetect archive type by extension (issue2058) 2010-03-11 15:52:17 +01:00
Dirkjan Ochtman
1a28729342 merge with stable 2010-03-11 15:38:35 +01:00
Dirkjan Ochtman
ccdb890cae server: initialize wsgi app in command, then wrap server around it 2010-03-11 13:33:29 +01:00
Benoit Boissinot
d9ed059088 serve: fix port config 2010-03-10 22:27:42 +01:00
Thomas Arendsen Hein
353664e4dc drop (default: 8000), non-zero default is automatically added to help 2010-03-10 21:35:38 +01:00
Thomas Arendsen Hein
5820023c69 make expression shorter, now the line fits into 80 chars 2010-03-10 21:21:15 +01:00
Benoit Boissinot
2c7dc781a2 serve: fix options recording, trailing whitespace 2010-03-10 21:14:24 +01:00
Bryan O'Sullivan
523d3acdc2 serve: allow --port=0 to specify "server chooses the port number" 2010-03-10 10:51:37 -08:00
Benoit Boissinot
812d07b742 merge with stable 2010-03-09 20:47:35 +01:00
Benoit Boissinot
04d99f9fbc patch/diff: move patch.export() to cmdutil.export() 
This API change will allow us to break a cycle between patch and cmdutil.
 2010-03-08 19:43:24 +01:00
Yuya Nishihara
d958341146 branch: help misuse of hg branch to switch branches 
Maybe beginners tend to use 'hg branch EXISTING_BRANCH' instead of
'hg update EXISTING_BRANCH' as me.
If so, let's help them to use 'update'.

Also removed '(use --force to override)' because it can mislead them.
 2010-01-12 22:49:10 +09:00
Thomas Arendsen Hein
20c8c9dcb9 Make annotate --follow an alias for -f/--file to behave like in older versions 
Since 461b5218840e annotate follows copies/renames by default, but the output
of e.g. "annotate --follow --number" should not change without some
deprecation time.
 2010-03-03 22:04:59 +01:00
Yuya Nishihara
c01490d7d8 alias: fixes exception when displaying translated help text 
__doc__ of aliased command shouldn't cointain non-ASCII characters,
because it'll be gettext-ed later by commands.help_().
Here gettext can raise UnicodeDecodeError.

Once concatenated two translatable strings into one, it become untranslatable.
So this patch moves 'alias for:' from dispatch.cmdalias to commands.help_,
where help texts are translated.

'alias for:' was introduced by 027d5c280eda.
 2010-03-01 23:27:44 +09:00
Greg Ward
64f2447d13 resolve: rewrite help to be clearer and more complete (issue2030). 2010-03-01 15:41:21 -05:00
Wagner Bruna
65dc62eef8 commands: clarify --config syntax 2010-02-24 11:04:56 -03:00
timeless
f739d87132 commands: correct diff -c explanation 2010-02-23 06:42:10 +01:00
timeless
bb1742e284 commands: mention diff -c 2010-02-21 01:21:17 +02:00
Dirkjan Ochtman
c2bc65394a identify: don't include unknown in status 2010-02-19 20:34:23 -05:00
Greg Ward
cb143d442a merge: fix --preview to show all nodes that will be merged (issue2043). 
Formerly, it omitted nodes that were not descendants of the least
common ancestor of the two merge parents, even though those nodes
contribute to the merge.  The new algorithm uses revlog.findmissing()
instead of ancestor() + nodesbetween().
 2010-02-15 15:25:29 -05:00
Benoit Boissinot
213d94e037 bundle: exclude csets given in --base, unless they are in --rev (issue1910) 
Thanks Jesse Glick for the first version of this patch.
 2009-11-16 16:10:05 -05:00
Martin Geisler
dd4c98e656 commands: correct example in add help text 2010-02-13 22:10:31 +01:00
Martin Geisler
d31befc2e6 commands: add verbose example to help text for add 2010-02-13 18:44:19 +01:00
Martin Geisler
958fb44719 commands: support verbose help 2010-02-13 18:36:24 +01:00
Matt Mackall
a2acbc421b fix up a bunch of check-code warnings 2010-02-09 14:12:22 -06:00
Peter Arrenbrecht
659da7174a whitespace cleanup 2010-02-08 20:51:23 +01:00
Benoit Boissinot
328394047f fix coding style (reported by pylint) 2010-02-08 15:36:34 +01:00
Matt Mackall
70833ec6ad summary: various fixes, add a test 
fix breakage from recent parseurl changes
fix reporting of resolved
fix reporting of update in certain cases
 2010-02-08 11:04:38 +01:00
Sune Foldager
0d082ae358 fix remaining hg.parseurl uses 2010-02-08 10:32:44 +01:00
Brendan Cully
ce047e9ab3 import: import each patch in a file or stream as a separate change 
Supports hg export <revrange>, mail messages, and mailboxes.
Does not support multiple patches in a single MIME attachment.
Closes issue167.
 2010-02-07 18:06:52 +01:00
Sune Foldager
3f138e6345 add -b/--branch option to clone, bundle, incoming, outgoing, pull, push 2010-02-07 15:23:46 +01:00
timeless
a4b2e4932b help: Improved body text 2010-02-07 15:08:26 +01:00
timeless@mozdev.org
4cd821593d commands: Try to improve help options text for basic commands 
Mostly rewrite -r text
 2009-11-20 14:37:36 +02:00
Dirkjan Ochtman
0e0764f0be commands: annotate follows by default, separate -f/--file option 2010-02-07 14:51:52 +01:00
Sune Foldager
5020620fca interpret repo#name url syntax as branch instead of revision 
Previously, the name part of an repo#name url was interpreted as a
revision, similar to using the --rev option. Now it is instead looked
up as a branch first, and if that succeeds all the heads of the branch
will be processed instead of just its tip-most head. If the branch
lookup fails, it will be assumed to be an revision as before (e.g. for
tags).
 2010-02-07 14:29:07 +01:00
Brodie Rao
91c6eab10f dispatch: provide help for disabled extensions and commands 
Before a command is declared unknown, each extension in hgext is searched,
starting with hgext.<cmdname>. If there's a matching command, a help message
suggests the appropriate extension and how to enable it.

Every extension could potentially be imported, but for cases like rebase,
relink, etc. only one extension is imported.

For the case of "hg help disabledext", if the extension is in hgext, the
extension description is read and a similar help suggestion is printed.
No extension import occurs.
 2010-02-07 14:01:43 +01:00
Benoit Boissinot
221f6cfbd6 merge: add hints about the use of 'hg heads' to find the rev to merge 2010-02-07 00:51:59 +01:00
Dirkjan Ochtman
101a05bdd6 commands: do all branch heads by default, demote topological to -t/--topo 2010-02-06 19:38:39 +01:00
Dirkjan Ochtman
e2c391eeae commands: actually implement --closed for topological heads 2010-02-06 19:33:40 +01:00
Dirkjan Ochtman
a5f8555923 commands: externalize branchheads so we can do it for all branches at once 2010-02-06 19:06:02 +01:00
Dirkjan Ochtman
e228418cb5 commands: move inactive/closed out so they can have more effect 2010-02-06 19:33:33 +01:00
Dirkjan Ochtman
6137e4212c commands: don't do too much work for error messages 2010-02-06 19:33:28 +01:00
Dirkjan Ochtman
50b37f6650 commands: allow --closed even for topological heads displays 
But it actually only starts working later on.
 2010-02-06 19:00:50 +01:00
Benoit Boissinot
7981695168 merge with main 2010-02-06 17:11:18 +01:00
Steve Losh
3a6ac9b1e1 commands: fix more changeset header information in 'hg help export' 2010-02-06 08:57:57 -05:00
Steve Losh
e1aa468eeb commands: fix the list of changeset header information in 'hg help export' 2010-02-06 08:28:39 -05:00
Dirkjan Ochtman
01ccbb45c0 commands: always order heads recent to oldest 2010-02-06 12:47:33 +01:00
Dirkjan Ochtman
645cbf8b4b commands: fix up stupidly untested heads simplification 2010-02-06 12:47:24 +01:00
Dirkjan Ochtman
56a10eac00 commands: simplify heads a little bit before I start hacking it up 2010-02-06 11:29:48 +01:00
Dirkjan Ochtman
99822443b5 commands: deprecate the heads -a option 
Hopefully we can remove it entirely in two releases or so.
 2010-02-06 11:28:03 +01:00
Benoit Boissinot
4371f512b2 fix spaces/identation issues 2010-02-05 18:50:08 +01:00
Steve Borho
b14b9d0a38 Merge with stable 2010-02-05 07:07:53 -06:00
Steve Borho
9f38cd0e08 commands: label from user is in local encoding 
repo.branchtags().keys() are in UTF-8, so the label should be converted to UTF-8
before checking for a naming conflict.  Keep the original label for ui.status()
 2010-02-05 04:33:08 -06:00
FUJIWARA Katsunori
b8e27ea1b4 summary: L10N messages hide clean-ness of workdir from 'hg summary' 
'hg summary' recognizes workdir as clean by searching for 'clean' is
in own output text. But 'clean' is one of I18N target texts, so 'hg
summary --quiet' behaves incorrectly in non-English locale.
 2010-01-20 13:50:06 +09:00
Matt Mackall
595d66f424 Update license to GPLv2+ 2010-01-19 22:20:08 -06:00
Jens Bäckman
482c7ff3a6 commands: fix typo in help text 2010-01-09 23:03:33 +01:00
Greg Ward
bfaf5baac2 commands: fix help string for pull -u and unbundle -u. 
They update to new branch head, not new tip -- same as 'hg update'.
 2010-01-05 15:07:38 -05:00
Martin Geisler
cc5314a970 commands: update copyright year to 2010 2010-01-04 01:09:23 +01:00
Matt Mackall
8d99be19f0 many, many trivial check-code fixups 2010-01-25 00:05:27 -06:00
Martin Geisler
a0fd2fa800 Merge with stable 2010-01-20 16:58:48 +01:00
Matt Mackall
cd3ef170f7 Merge with stable 2010-01-19 22:45:09 -06:00
Martin Geisler
542da45c3a commands: mark "ssh://" as inline literals in help texts 2009-12-01 00:15:45 +01:00
timeless@mozdev.org
15e268f188 commands: add missing options in command line help 2009-11-28 23:44:18 +01:00
Martin Geisler
7fb918d179 commands: mark strings for translation 2009-11-28 23:23:16 +01:00
Faheem Mitha
1bec9addf2 commands: improve help for "hg clone -r" 2009-11-19 17:33:41 -05:00
Martin Geisler
fe0b7cb0b8 commands, dates: use real lists instead of literal blocks 2009-11-19 23:29:02 +01:00
Martin Geisler
f70df45cf9 commands: use field lists instead of literal blocks in docstrings 
The literal blocks were mis-used for alignment, but this of course
changes the font of the entire block to a fixed width font in the HTML
version. Using a proper list solves this.
 2009-11-19 23:27:11 +01:00