Nicolas Dumazet
6adbb3c99f
util: canonpath: simplify logic
...
if root == os.sep, then endswithsep(root) is True as well: one test is enough
2009-08-22 15:47:03 +02:00
Patrick Mezard
a1609c7698
Merge with crew-stable
2009-08-23 13:03:10 +02:00
Martin Geisler
e2912b8950
Merge with crew-stable
2009-08-22 10:52:53 +02:00
Martin Geisler
b139d35cc0
hgrc.5: document %unset directive
2009-08-22 10:50:29 +02:00
Dirkjan Ochtman
64fb856abf
merge with crew-stable
2009-08-22 10:25:50 +02:00
Martin Geisler
73b766980d
Merge with crew-stable
2009-08-22 01:37:28 +02:00
Martin Geisler
96c88eb0e0
hgrc.5: document %include directive
2009-08-22 01:34:56 +02:00
Martin Geisler
476e39b88f
mq: don't mention qtop in module doc string
...
(qtop was removed in 5b1bcf3885fe)
2009-08-21 16:58:30 +02:00
Patrick Mezard
cb35e02c8f
color: no need for itertools, zip() is good enough
2009-08-21 14:29:54 +02:00
Adrian Buehlmann
0a39b63526
dirstate.write: don't ignore stat data if mtime is in the future (issue1790)
...
This change narrows the race guard that was introduced by ffd022830d6d
("dirstate: ignore stat data for files that were updated too recently")
to not discard the _map entry's stat data if the mtime is in the future.
Without this change, status locks files having odd mtimes in the future
into the 'unset' state, causing needless file compares later (admittedly
harmless), but also inflicting highly irritating sticky effects on
tools/plugins that directly read .hg/dirstate (e.g. TortoiseHg).
2009-08-21 14:17:23 +02:00
Carey Evans
28b2e6acc5
util: Fix date format for 12-hour time.
2009-08-21 21:52:57 +12:00
Mads Kiilerich
9920fe3bc5
test-command-template: Don't diff files with same content
...
Solaris diff will report "No differences encountered" on stdout
2009-08-22 15:36:52 +02:00
Dirkjan Ochtman
1677a2b0c1
log: fix traceback for log -k caused by 51e61d3c56bc (issue1805)
2009-08-21 09:33:27 +02:00
Dirkjan Ochtman
2f2b5e0e4f
templater: remove support for ## template variables
2009-08-20 10:41:56 +02:00
Dirkjan Ochtman
1eca14ba70
graphlog: simplify ascii drawing to process one cset at a time
2009-08-20 08:49:01 +02:00
Dirkjan Ochtman
9df20e1f95
graphlog: shorter variable names, fewer underscores, single state container
2009-08-20 08:36:20 +02:00
Dirkjan Ochtman
f7cb958259
graphlog: move common code into function again, change function types
2009-08-20 08:35:35 +02:00
Dirkjan Ochtman
c6e10d384b
graphlog: extract some setup code out of common functions
2009-08-20 08:35:03 +02:00
Dirkjan Ochtman
e00109f7e7
cmdutil: use context objects for walkchangerevs()
2009-08-20 08:34:22 +02:00
Dirkjan Ochtman
4fc1177ba0
mq: get rid of qnext, qprev and qtop
2009-08-19 12:51:07 +02:00
Dirkjan Ochtman
d825977cb1
mq: add options to qapplied/qunapplied to act like qprev/qnext
2009-08-19 12:50:46 +02:00
Dirkjan Ochtman
d96058fd14
hgweb: add web.descend configuration variable
2009-08-19 12:47:04 +02:00
Greg Ward
4b5e9861a0
tags: don't crash if unable to write tag cache
...
This happens with hgweb in real life, if the httpd user is unable to
write in the repository directory. Another case is doing 'hg incoming'
on a repository in the filesystem owned by someone else.
2009-08-18 22:07:43 -04:00
Martin Geisler
0f0f34a99a
help: align columns "hg help templates" output
2009-08-18 13:59:30 +02:00
Martin Geisler
531c6ddba3
Merge with crew-stable
2009-08-18 13:55:34 +02:00
Martin Geisler
01be01a4e5
help: show results of all date filters
2009-08-18 13:40:19 +02:00
Martin Geisler
482ea06365
help: document isodatesec and rfc3339 filters (issue1799)
2009-08-18 13:00:13 +02:00
Steve Borho
ef214fdcd8
Merge with crew-stable
2009-08-17 20:20:34 -05:00
Steve Borho
5d6c914525
iss: make mfc*.dll and msvc*.dll optional
...
mfc71.dll was only needed for Python2.4
msvc*.dll is similarly optional
Do not bail installer build if not found
2009-08-16 20:53:49 -05:00
Steve Borho
bef6f273c2
iss: take version from iscc command line or __version__.py
...
Requires InnoSetup Preprocessor to be installed.
2009-08-16 21:23:48 -05:00
Nicolas Dumazet
072c9e497b
inotify: use cmdutil.service instead of local daemonizing code
2009-08-16 11:11:37 +09:00
Nicolas Dumazet
9c19061a7e
cmdutil: service: add an optional runargs argument to pass the command to run
...
This would be necessary for inotify launching its server: the initial command
is a standard 'hg st'/'hg ci'/... but the daemon to run is 'hg inserve'
2009-08-16 11:30:24 +09:00
Sune Foldager
c7e7232f9e
extdiff: add 3-way diff for merge changesets
...
This adds 3-way diff for merge changesets (using -c) and for diffing
the working directory context against two parents. To enable it, use
the new magic value '$parent2' in the argument line. In order to work,
your differ must support that the second parent argument is left out;
this will happen in 2-way mode. Default arguments are as before, without
enabling 3-way mode, ensuring backwards compatibility.
This also fixes a problem when diffing a merge changeset with a single
file change. Extdiff would sometimes do the wrong thing in that situation.
2009-09-17 21:12:32 +02:00
Kevin Bullock
7d9f94de98
bash_completion: add completions for shelve extension
2009-09-23 21:29:47 -05:00
Adrian Buehlmann
75ad7600e0
doc: clarify license footers
...
Mercurial is licensed under version 2 of the GPL
2009-10-01 11:40:53 +02:00
Adrian Buehlmann
03085a4ef2
dirstate: kill dirstate.granularity config option
...
The dirstate.granularity configuration parameter was never documented,
it only adds code complexity and it is unneeded.
Adding comments describing forced 'unset' entries.
2009-10-01 17:17:52 +02:00
Matt Mackall
3e6199cea0
Merge with -stable
2009-09-30 21:42:51 -05:00
Matt Mackall
76ac5743c5
subrepo: add auto-pull for merge
2009-09-30 18:47:33 -05:00
Christian Ebert
c4018af637
keyword: uppercase short option for kwfiles --all, like hg status -A
...
Deprecate kwfiles -a.
2009-10-01 00:00:18 +02:00
Christian Ebert
13ea5fdcd5
keyword: make kwfiles -u show untracked files only (like status)
...
Remove extra documentation of -u/--unknown, as this is covered in
the option help already.
Like commands.status the code now zips the status flags.
Add more kwfiles tests.
2009-09-30 23:59:03 +02:00
Christian Ebert
69a435e154
keyword: make kwfiles --all show unknown files too
...
More consistent and similar to hg status.
2009-09-30 23:59:03 +02:00
Christian Ebert
1e5fb59571
keyword: kwfiles --unknown instead of --untracked
...
Use the same option name as "hg status".
Retrieve option in _status().
Mark --untracked as deprecated.
2009-09-30 22:39:56 +02:00
Greg Ward
21961703e5
streamclone: partially encode filename over the wire, not for local read (issue1847)
...
(Fixes issue1847, which was introduced by 67e6074ba430: stream clone
of a repo with directory named *.d failed: server raises exception
"IOError: [Errno 2] No such file or directory:
/tmp/test/.hg/store/data/foo.d.hg.hg/foo".)
2009-09-30 16:08:11 -04:00
Matt Mackall
ca1c1877e8
Merge with i18n-stable
2009-09-30 13:15:18 -05:00
Martin Geisler
3e05f2c2a8
ui: guard against UnicodeDecodeErrors in ui.wrap
2009-09-29 01:08:18 +02:00
Martin Geisler
e07e69a3c3
i18n-da: random small strings, only 499 strings left
2009-09-29 00:42:14 +02:00
Martin Geisler
fba2d48279
Merge with main
2009-09-29 00:23:01 +02:00
Greg Ward
b802932aac
commands: tweak help for 'heads'.
...
- prefer "changeset" over "revision" for internal consistency
- clarify explanation of branch heads
- add a line break
- tighten some wording
2009-09-17 18:12:53 -04:00
Martin Geisler
0e21f7c48c
i18n-da: translate addremove, branch, and cat
2009-09-28 00:23:44 +02:00
Martin Geisler
fca47ed955
i18n-da: synchronized with 32241170a740
2009-09-27 23:56:27 +02:00
