Brendan Cully
17df733f51
Update qsave to use StatusEntry; don't throw exception on bad status lines.
2006-08-07 14:48:18 -07:00
Brendan Cully
8601c3c0fc
Update mq to use new logmessage arglist from 2794:7eff50864c5c
2006-08-07 14:12:03 -07:00
Matt Mackall
3dcc28a29a
Merge with crew
2006-08-07 16:47:06 -05:00
Vadim Gelfer
f653b6c12f
fetch: add missing import.
2006-08-07 19:08:55 -07:00
Vadim Gelfer
4068ec9129
fetch: do not fetch if working dir modified
2006-08-07 17:33:14 -07:00
Vadim Gelfer
d90021dfb5
new extension: fetch -> combine pull and merge/update
...
pull changes from remote repo.
if changes add new head: merge with new head, commit result.
else: update working dir to new head.
this makes useful command like git 'pull' command.
2006-08-07 17:27:38 -07:00
Vadim Gelfer
5e57b38568
commands.logmessage: simplify calling.
2006-08-07 17:23:04 -07:00
Vadim Gelfer
dc56cac613
localrepo.update: allow to suppress commit reminder.
2006-08-07 17:22:17 -07:00
Matt Mackall
d5009b5b05
Move repo.verify
2006-08-07 16:27:09 -05:00
Benoit Boissinot
1c4f02dea9
mq: unused variables, improper usage of 'is [not]', undefined variable
2006-08-06 17:27:05 +02:00
Benoit Boissinot
6f5cfdaee1
mq: codingstyle
2006-08-06 17:24:13 +02:00
Benoit Boissinot
c62e480a61
mq: remove unecessary test
2006-08-06 17:20:51 +02:00
Benoit Boissinot
541cff5e76
mq: fix variables shadowing builtin
2006-08-06 17:18:53 +02:00
Benoit Boissinot
dc4c4a5959
util.patch: use shellquote
2006-08-06 16:42:36 +02:00
Brendan Cully
879b9bce42
mq: use more portable util.parse_patch_output instead of handrolled version.
2006-08-05 14:59:47 -07:00
Brendan Cully
5d7f00c97d
Add portable shell-quoting function; teach mq to use it.
2006-08-05 15:23:26 -07:00
Benoit Boissinot
69b70a588e
mailbomb: add a comment and remove the bcc in a more pythonic way
2006-08-06 16:03:02 +02:00
Brendan Cully
b5f7a6230c
Add '.' as a shortcut revision name for the working directory parent.
2006-08-04 14:36:03 -07:00
Vadim Gelfer
c5053e3bb6
make error better.
2006-08-05 02:00:09 -07:00
Vadim Gelfer
8b999d6f47
merge with self.
2006-08-04 10:38:17 -07:00
Vadim Gelfer
f34bef85ce
fix output of test-backout.
2006-08-04 10:37:40 -07:00
Matt Mackall
4dc0a93fd6
revlog.lookup optimization
2006-08-03 21:24:19 -05:00
Matt Mackall
97d8934ce9
Remove **opts arg from commands.doupdate
2006-08-03 20:06:05 -05:00
Brendan Cully
956d0c4e17
Test suite for log --follow and --follow-first.
2006-08-03 15:12:15 -07:00
Matt Mackall
65b6faa1aa
Move merge code to its own module
...
Pull update and merge3 out of localrepo into merge.py
s/self/repo/
Add temporary API function in hg.py
Convert all users
2006-08-03 15:24:41 -05:00
Brendan Cully
e901963dbd
Add log option --follow-first to follow only the first parent of
...
merges.
This can be useful to extract a single line of development.
2006-08-03 11:48:56 -07:00
Brendan Cully
1a2cc77cfa
Make log --follow revision range start default to working dir parent.
2006-08-03 13:29:31 -07:00
Vadim Gelfer
e7a19cd577
merge with brendan.
2006-08-03 11:12:02 -07:00
Brendan Cully
03cc700164
Use StatusEntry class instead of repeated status line parsing.
...
This small cleanup abstracts out repeated instances of
(rev, name) = applied[x].split(':'), making it easier to use
applied or change the status file format.
2006-08-03 11:09:12 -07:00
Matt Mackall
1daa0d8fba
Add a doc string
2006-08-03 13:07:57 -05:00
Brendan Cully
aec3a9ce5b
Make log --follow without a file list follow a single head.
...
This includes all the parents or children (depending on the direction
of the revision range).
2006-08-03 11:06:09 -07:00
Vadim Gelfer
25f77c8e58
mq: make queue.unapplied useful as api
2006-08-02 21:06:12 -07:00
Vadim Gelfer
9f3dbcd014
mq: print matches if patch name not unique
2006-08-02 06:36:27 -07:00
Mathieu Clabaut ext:(%22)
dced35893a
Import say a file is not tracked after patching : test case
2006-08-02 09:29:17 +02:00
Vadim Gelfer
7369cfc5b9
mq: simplify save_dirty
2006-08-02 20:33:57 -07:00
Brendan Cully
cd3bd9b901
Add -f option to qfold; improve qfold documentation.
2006-08-02 15:07:37 -07:00
Brendan Cully
a7db3381e3
Clean up qnew help text.
2006-08-02 14:48:59 -07:00
Vadim Gelfer
45763df4fc
tests: fix output for test-backout
2006-08-02 13:04:36 -07:00
Vadim Gelfer
338d2303a1
allow None for path of hg.repository
2006-08-02 12:46:00 -07:00
Vadim Gelfer
821fc85964
mq: rename read_series as parse_series, make simpler and faster
2006-08-02 10:48:34 -07:00
Bryan O'Sullivan
688915efdf
fix call to commands.setremoteconfig
2006-08-02 09:18:56 -07:00
Vadim Gelfer
3e92464f80
clone: replace long help string of inaky with doc comment.
2006-08-01 19:58:34 -07:00
Inaky Perez-Gonzalez
b5488dcd48
Breakup clone -r extra text help to fit in 80 columns
2006-08-01 11:12:34 -07:00
Inaky Perez-Gonzalez
3c5b91fa37
Expand clone help with hardlink information
2006-08-01 09:50:30 -07:00
Christian Ebert
68ecb33563
fix hg backup option recommendation for auto-merge
2006-08-02 03:17:06 +02:00
Vadim Gelfer
74f5dcdc3d
import: make patch apply if run in subdir
...
fix is same as for mq patch. patch apply code should be merged.
2006-08-01 15:51:13 -07:00
Christian Ebert
e16085a325
hgcommand.vim: requirements & doc self-install more consistent; cosmetics
...
Check for availability of builtin system().
Set 'compatible' while sourcing script.
File operation during doc self-install:
Escape spaces in ex-commands.
Use quotes in system calls.
Incremented revision number(s).
Size of patch is due to cosmetic cleanups:
Removal of spaces at line endings.
<SID>Prefix to functions when called.
2006-08-02 00:20:28 +02:00
Vadim Gelfer
fb083c6317
fix mq test output.
2006-08-01 15:40:54 -07:00
Vadim Gelfer
dc26ae9fe1
merge patches from brendan cully that did not apply clean against tip.
2006-08-01 15:40:28 -07:00
Brendan Cully
fecf9b2ed3
Add -s option to qseries: display first line of patch header.
2006-08-01 15:24:18 -07:00
