Emanuele Aina
5968bafc17
purge: don't delete ignored files if --all is not specified
2007-06-06 22:17:35 +02:00
OHASHI Hideya
83f32e7ff9
Enable to select encoding in hgrc web section
...
This patch provides character encoding setting in each repository. After this
patch, You can use multi encoding repositories with one mercurial server.
2007-06-13 18:18:06 +09:00
Thomas Arendsen Hein
2f42bdc4f1
merge with main
2007-06-23 21:11:28 +02:00
Thomas Arendsen Hein
9270e4454c
hgk: Use $HG instead of hg (see 9779a8c8d672)
2007-06-23 21:10:55 +02:00
Matt Mackall
aff448fc36
archive: remove spurious flag_bits setting
...
This makes zip -T on resulting archives work. File permissions are
still retained.
2007-06-23 14:02:41 -05:00
Matt Mackall
3791779d22
convert: sometimes git forgets the author
2007-06-23 13:33:45 -05:00
Thomas Arendsen Hein
22ec03c681
hgeditor: Use $HG to run 'hg diff' (see 9779a8c8d672)
2007-06-23 20:22:17 +02: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
Thomas Arendsen Hein
45612e4757
Merge with main
2007-06-23 12:05:00 +02:00
Alexis S. L. Carvalho
cc6e60f60e
merge: fix small bug with a failed merge across a rename
...
If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy
f to fd, and util.set_exec wouldn't find the file.
2007-06-22 20:44:40 -03:00
Alexis S. L. Carvalho
769bdcbb59
transplant: fix locking order
2007-06-22 19:43:29 -03:00
Matt Mackall
8dc00c8475
rollback: update help for issue316
2007-06-22 17:29:49 -05:00
Alexis S. L. Carvalho
e85eaa593d
git patches: correct handling of filenames with spaces
...
Add a trailing TAB to the "--- filename" lines if there's a space
in the file name. This allows patch(1) to work correctly. The
same is done for diff --nodates.
This was originally suggested by Andrei Vermel, but at the time
I thought git was doing something different.
2007-06-22 19:06:04 -03:00
Alexis S. L. Carvalho
b8f177ebbe
Work around urllib2 digest auth bug with Python < 2.5
...
This should fix issue570.
2007-06-22 14:32:54 -03:00
Alexis S. L. Carvalho
64a37442ed
dirstate.status: if a file is marked as copied, consider it modified
...
After a "hg copy --force --after somefile cleanfile", cleanfile
shouldn't be considered clean anymore.
2007-06-21 23:42:06 -03:00
Matt Mackall
265560b37a
Merge with Eric Hopper
2007-06-21 18:05:14 -05:00
Matt Mackall
a38809cf9e
merge: warn user about divergent renames
2007-06-21 18:02:03 -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
Matt Mackall
f0400ad7b9
dispatch: parse local hgrc for paths
2007-06-21 13:09:00 -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
Thomas Arendsen Hein
1b20c30e25
hgweb_mod.archive(): Use 'key' instead of builtin 'id'.
2007-06-21 19:38:44 +02:00
Thomas Arendsen Hein
9a78cd828a
Remove useless variable assignments in util.opener.
...
The original idea might have been to prevent circular references, but
as this assignment would have created another reference, this makes
no difference.
2007-06-21 19:24:27 +02: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
7be33e5057
context: add tags() method
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
f1c2183cb0
Backed out changeset 6e4b2043f10ea50b3eeb0ceb3e8776032fb8d92e
...
Only printenv was changed, not the actual execution of hooks.
And not setting an empty value might cause problems on platforms
which can't always remove variables from the environment.
2007-06-21 10:00:59 +02:00
Thomas Arendsen Hein
4df6409ef2
Adjust note about variables not being set for empty values.
2007-06-21 09:45:33 +02:00
Thomas Arendsen Hein
3019bb7a0b
Kill trailing spaces
2007-06-21 09:25:49 +02:00
Alexis S. L. Carvalho
1d182cc78a
mq: test that qpush cleans things up when it fails
2007-06-21 00:34:14 -03:00
Alexis S. L. Carvalho
d4cae7d8a5
dirstate.invalidate: clear dirty flag
2007-06-21 00:34:14 -03:00
Alexis S. L. Carvalho
3beeb3356f
dirstate: fix typo
2007-06-21 00:34:14 -03:00
Alexis S. L. Carvalho
2bdde5e379
update the output of test-help and test-globalopts
2007-06-21 00:34:14 -03:00
Brendan Cully
f7e826dad3
Fix dispatch error message when not in a repo
2007-06-20 20:13:31 -07:00
Brendan Cully
5e31fc3bf9
archive: test md5 consistency
2007-06-20 19:20:37 -07:00
csaba.henk@creo.hu
e069b7ea12
timestamp of gzip archives taken from changeset context
2007-06-11 19:09:01 +02:00
Brendan Cully
e756af498f
Test attempt to remove nonexistent tag
2007-06-20 18:09:40 -07: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
Eric Hopper
bdc1293e28
Provide a version independent way to use the set datatype.
2007-06-19 08:37:41 -07:00
Patrick Mezard
9a43b6739b
Fix read mode when importing patch.
2007-06-19 17:03:31 +02:00
Patrick Mezard
6ef4333a38
Add tests for ui.patch regression.
2007-06-20 23:32:31 +02:00
Patrick Mezard
8f4c2f4b77
patch: fix ui.patch regression introduced by ef94caf261ce.
...
The idea is ui.patch is either empty or wisely filled by user.
2007-06-19 17:02:07 +02:00
Patrick Mezard
82fd511346
printenv: filter empty environment variables for portability.
2007-06-20 22:06:37 +02:00
Patrick Mezard
10eeab335d
Merge with crew-stable
2007-06-20 22:05:43 +02:00
