Thomas Arendsen Hein
31213f9684
Mention 'hg update' to switch branches in help for branch and branches.
2008-02-02 14:55:14 +01:00
Thomas Arendsen Hein
73a0d43985
Clarify help for hg status and make it consistent.
2008-02-02 14:49:31 +01:00
Dirkjan Ochtman
9098bb23f2
update copyright notice in version output
2008-02-01 10:31:15 +01:00
Michele Cella
095d8aff18
hgweb: fixes to make hg serve prefix handling more robust
2008-01-22 22:13:29 +01:00
Brendan Cully
53f181168a
Document --base null in bundle help
2008-01-11 18:31:13 -08:00
Jesse Glick
b6fdc96f71
Permitting the import command to accept a --user option.
...
The prose section of the help text for the command already said that -u and -m
are accepted, but -u was not listed in the table of options, and did not work.
Useful when accepting patches from other people made by hg diff rather than hg
export. For completeness, also accepting -d DATE.
[CHANGES: rebased against 2f0da487820f, --no-commit option.]
2008-01-25 19:49:15 -05:00
Joel Rosdahl
119bfb41b7
Add --no-commit option to import command
2008-01-25 13:48:35 +01:00
Giorgos Keramidas
ce5f6f93a6
Display debugstate dates as '%Y-%m-%d %H:%M:%S'
2008-01-11 23:30:56 +02:00
Brendan Cully
ccd2e479d6
Merge with crew-stable
2008-01-11 18:33:10 -08:00
Michele Cella
0e20a92c0f
adding "prefix" option to "hg serve" (command line and [web] section)
...
allows "hg serve" to serve from a different path than '/' (server root)
2008-01-09 11:15:00 +01:00
Maxim Dounin
4d9877b4eb
Fix copies reporting in log and convert.
...
If copy logged in file revision, we report copy for changeset only
if file revisions linkrev points back to the changeset in question
or both changeset parents contain different file revisions.
This fixes extra copies reported when executable bit was changed for
previously copied file.
2007-12-29 17:11:48 +03: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
Thomas Arendsen Hein
ba430fb598
Sort commands table again and add some missing 'hg' in synopsises.
2008-01-01 19:20:03 +01:00
Thomas Arendsen Hein
70877e1ad5
realign commands table
2008-01-01 11:19:15 +01:00
Matt Mackall
917f5ce70a
bisect: handle search for bad to good transitions
...
Automatically detect whether we're looking for a bad to good
transition rather than the usual good to bad transition by detecting
when badrev is inside the good set and flipping good/bad.
2007-12-31 18:20:34 -06: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
Thomas Arendsen Hein
347da85c36
Removed tabs and trailing whitespace in python files
2007-12-29 19:49:48 +01:00
Matt Mackall
3d2020e6ca
add debugfsinfo to check fs capabilities
2007-12-27 23:55:40 -06:00
Matt Mackall
c205c57746
cmdutil: make bail_if_changed bail on uncommitted merge
2007-12-27 23:55:39 -06:00
Patrick Mezard
fd1268357e
commands: add exits(1) if a specified file cannot be added (issue 891)
2007-12-24 12:14:43 +01:00
Osku Salerma
7f9d71b715
Use VISUAL in addition to EDITOR when choosing the editor to use.
2007-12-05 20:40:01 +09:00
Osku Salerma
e2010f2b5b
Add --verbose support to tags command.
2007-12-09 17:14:38 +09:00
Osku Salerma
cb7de57ab7
Properly check tag's existence as a local/global tag when removing it.
2007-12-09 16:32:05 +09:00
Matt Mackall
964d06fc69
rm: complain more about removing added files
2007-12-10 10:24:21 -06:00
Matt Mackall
06d5fbf2a5
copy: handle rename internally
...
- add rename parameter
- don't collect copied list
- report "moving" rather than "copying"
- remove renamed files
- don't return copied list
- simplify callers
2007-12-07 02:29:55 -06:00
Matt Mackall
87c040230a
move commands.docopy to cmdutil.copy
2007-12-02 18:11:59 -06:00
Matt Mackall
e03c4beef0
imported patch rollback-help
2007-12-02 15:26:01 -06:00
Matt Mackall
4c9c6fbda6
imported patch rev-help
2007-12-02 15:25:37 -06:00
Matt Mackall
3418169510
clarify rm -A
2007-11-09 10:45:58 -06:00
Manuel Holtgrewe
4a33cb8d98
Do not display passwords with pull/push/incoming/outgoing
...
Passwords specified in the repository URL are now displayed as '***'
when accessing the remote repository.
2007-11-05 20:29:32 +01:00
Dustin Sallings
bebcdac954
Use both the from and to name in mdiff.unidiff.
...
This fixes a compatibility issue with git diffs.
* * *
2007-11-01 12:17:59 -07:00
Matt Mackall
4412e65957
backout: disallow across branches (issue655)
2007-12-01 13:09:27 -06:00
Matt Mackall
ad28be7c23
i18n: fix complaints from pygettext
2007-11-20 15:54:25 -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
Thomas Arendsen Hein
b35814d4c2
merge with crew-stable
2007-07-22 09:45:18 +02:00
Bryan O'Sullivan
a09e8936ae
addremove: print meaningful error message if --similar not numeric
2007-07-21 19:07:18 -07:00
Matt Mackall
cd72dc7f1b
Merge with crew
2007-07-21 16:44:38 -05:00
Matt Mackall
3a3bd8ec5b
Make repo locks recursive, eliminate all passing of lock/wlock
2007-07-21 16:02:10 -05:00
Matt Mackall
3e13c68628
Use try/finally pattern to cleanup locks and transactions
2007-07-21 16:02:10 -05:00
Matt Mackall
5a93a0feb4
repo locks: use True/False
2007-07-21 16:02:09 -05:00
Matt Mackall
c2967290a5
dirstate: add __contains__ and make __getitem__ more useful
...
dirstate.state(f) == '?' -> f not in dirstate
dirstate.state(f) -> dirstate[f]
2007-07-21 16:02:09 -05:00
Matt Mackall
cf691df912
dirstate: break update into separate functions
2007-07-21 16:02:09 -05:00
Benoit Boissinot
84d45c7794
fix unused variables reported by pychecker
2007-07-20 09:31:32 +02:00
Alexis S. L. Carvalho
e0b6efcdbf
help: avoid traceback if an extension has only debug commands
2007-07-19 19:43:25 -03:00
Alexis S. L. Carvalho
a8e3b41c40
merge with crew-stable
2007-07-19 19:48:24 -03:00
Bryan O'Sullivan
8d0f81f7cc
Simplify update.
2007-07-18 14:00:55 -07:00
Bryan O'Sullivan
5930d0695b
Simplify update.
2007-07-18 14:00:55 -07:00
Bryan O'Sullivan
f645e069a4
Better fix for issue 622 than we had in 287a2fbd37b0.
2007-07-18 13:56:08 -07:00
Bryan O'Sullivan
261434d5a1
Better fix for issue 622 than we had in 287a2fbd37b0.
2007-07-18 13:56:08 -07:00
Alexis S. L. Carvalho
ae58d97874
merge with crew-stable
2007-07-17 09:28:01 -03:00
Alexis S. L. Carvalho
4770c831b2
hg parents: don't pass an OS-specific path to repo.filectx
...
The only reason to use the matcher code instead of calling util.canonpath
directly is to be able to use "path:canonical/path/to/file" patterns.
2007-07-17 09:08:29 -03:00
Bryan O'Sullivan
e2e04c39f7
issue 622: pull/unbundle -u updates to default branch if repo was empty
2007-07-16 18:01:20 -07:00
Bryan O'Sullivan
ef448328f7
issue 622: pull/unbundle -u updates to default branch if repo was empty
2007-07-16 18:01:20 -07:00
Matt Mackall
86ab3ea033
Merge with -stable
2007-07-14 13:34:40 -05:00
Giorgos Keramidas
827573f6ad
hg grep: handle re.compile errors & update tests/test-grep
2007-07-09 17:41:14 +03:00
Alexis S. L. Carvalho
3b07689b6a
serve: respect settings from .hg/hgrc
...
create_server was looking only at the root ui object, ignoring any
settings from .hg/hgrc. To keep respecting command-line arguments,
commands.serve must also call repo.ui.setconfig.
2007-07-11 19:56:16 -03:00
Alexis S. L. Carvalho
05dd580e30
merge with crew-stable
2007-07-11 20:15:03 -03:00
Brendan Cully
5421e55633
archive: abort on empty repository. Fixes #624 .
2007-07-10 10:06:24 -07:00
Brendan Cully
4654693aa4
Add SSL support to hg serve, activated via --certificate option
2007-07-09 22:12:28 -07:00
Thomas Arendsen Hein
5a9970a155
Add --line-number option to hg annotate (issue506)
...
Line numbers are separated from the last annotation element with a colon,
like with many other commands, e.g. (hg) grep or compiler errors.
Idea and tests by FUJIWARA Katsunori.
2007-07-08 19:59:02 +02:00
Thomas Arendsen Hein
78616ff36e
Use a prefix for debuginstall tempfiles.
...
This way you know where the files came from if they don't get removed.
2007-07-07 20:52:31 +02:00
Matt Mackall
dc9134201b
extensions: untangle some recursive dependencies
2007-07-05 15:37:23 -05:00
Patrick Mezard
cd13d33922
Fix issue589 wording problem
2007-07-05 19:13:08 +02:00
Thomas Arendsen Hein
d01208a3d1
Fixed calling the merge script and reporting errors in debuginstall (issue617)
2007-07-04 09:20:56 +02:00
Alexis S. L. Carvalho
8c2c88e404
Make hg add foo; hg mv foo bar work.
...
- foo will be removed (the user has a copy of its contents in bar)
- bar will not be marked as a copy (there was no committed version of foo).
We print a warning telling that to the user.
Fixes issue269.
2007-07-03 03:06:40 -03:00
Brendan Cully
b1034db3e9
Handle extensions with defined but empty cmdtable
2007-06-28 21:16:25 -07:00
Thomas Arendsen Hein
0b7147a667
Updated command tables in commands.py and hgext extensions.
...
- Marked for translation where extensions already had _()
- Corrected indentation
- fixed a few synopsises
2007-06-26 22:38:57 +02:00
Thomas Arendsen Hein
5b3cfe2be9
Fix and test 'hg backout' without or with too many revisions.
2007-06-26 15:28:17 +02:00
Matt Mackall
469dca271e
backout: report short hash in commit message
2007-06-25 12:44:48 -05: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
9f3b2a8b06
cat: return an error on failure
2007-06-24 09:47:54 -05:00
paul sorenson
7f3fb6d66f
Command in doc comment is now on a single line, fixed
...
after previous formatting broke it.
2007-06-23 22:25:11 -05:00
Thomas Arendsen Hein
2e76adae49
Remember path to 'hg' executable and pass to external tools and hooks as $HG.
2007-06-23 20:21:10 +02:00
Matt Mackall
8dc00c8475
rollback: update help for issue316
2007-06-22 17:29:49 -05:00
Matt Mackall
265560b37a
Merge with Eric Hopper
2007-06-21 18:05:14 -05:00
Patrick Mezard
21ea8128a8
Merge with crew
2007-06-21 22:19:41 +02:00
Marcos Chaves
f5c072cbc9
Handle CTRL+C in serve under Windows.
2007-06-21 21:58:18 +02:00
Matt Mackall
613a7dfcea
identify: take a path to a remote repo
...
Rather than using -R, we take a path as an argument. This lets us use
url#branch syntaxes that may be in hgrc.
2007-06-21 13:09:01 -05:00
Eric Hopper
964ff0a5e3
Change branches to sort 'active' branches first, and add an option to show only active branches.
2007-06-21 10:40:09 -07:00
Matt Mackall
b5a98f60fd
identify: work with remote repos
2007-06-21 11:54:16 -05:00
Matt Mackall
7d837ca833
identify: add support for output flags
2007-06-21 11:54:13 -05:00
Matt Mackall
a0395f3952
identify: accept a revision argument
2007-06-21 11:54:11 -05:00
Matt Mackall
0ca818e7d0
identify: use contexts
2007-06-21 11:42:39 -05:00
Matt Mackall
1f80f939a9
identify: show nullid for empty repo
2007-06-21 11:42:39 -05:00
Thomas Arendsen Hein
3019bb7a0b
Kill trailing spaces
2007-06-21 09:25:49 +02:00
TK Soh
abffe2b1c3
tag: abort when trying to remove nonexistent tags
2007-06-15 14:48:21 -05:00
Brendan Cully
95c08c2bfc
Small fixes for 3acdabb0ef1d (hg heads branch)
2007-06-20 17:53:11 -07:00
Eric Hopper
0bcc9fc15c
Add option to heads to show only heads for current branch.
2007-06-19 08:37:43 -07:00
Patrick Mezard
9a43b6739b
Fix read mode when importing patch.
2007-06-19 17:03:31 +02:00
Patrick Mezard
0b90ff3d83
Merge with crew-stable
2007-06-20 00:22:51 +02:00
Patrick Mezard
ded8d8999d
Fix debugrename --rev option
2007-06-20 00:09:30 +02:00
Thomas Arendsen Hein
4d29c6dc8e
Updated copyright notices and add "and others" to "hg version"
2007-06-19 08:51:34 +02:00
Matt Mackall
c71a2b10a7
dirstate: hide internal vars
...
Add an __iter__ method so commands don't need to poke at _map.
2007-06-18 13:24:34 -05:00
Brendan Cully
b6d2fc3ac4
Notify the user that hg branch does not create a branch until commit
2007-06-18 10:44:43 -07:00
Thomas Arendsen Hein
1bdf3feac6
Make --import-branch option actually work (- is translated to _)
2007-06-17 14:11:30 +02:00
Eric Hopper
4e64ad3b5a
Add --import-branch option to hg import to pull in branch information without --exact
2007-06-14 09:01:51 -07:00
Brendan Cully
228060290f
Make parents with a file but not a revision use working directory revision.
2007-06-14 10:58:49 -07:00
Alexis S. L. Carvalho
2a15874eb2
commands.remove: don't use the unknown list
2007-06-13 19:15:58 -03:00