Commit Graph

941 Commits

Author SHA1 Message Date
Thomas Arendsen Hein
f0f68949d5 tab/space cleanup 2008-03-21 00:39:39 +01:00
Patrick Mezard
df0cbbb71a convert: allow missing tools not to stop source type detection 2008-03-20 23:32:43 +01:00
Matt Mackall
a0ccc8000c pager: further simplify code, clean up comments 2008-03-20 11:12:35 -05:00
David Soria Parra
190db7278a Use the pager given by the environment to display long output
Unix systems usually have a PAGER environment variable set.
If it is set, mercurial will use the pager application to display
output.

Two configuration variables are available to influence the
behaviour of the pager:
  pager.application
    sets the application to be used
  pager.quiet
   silences Broken Pipe errors that might occur when the user
   quits the pager before mercurial finished to write the output
2008-03-20 00:57:14 +01:00
Eric Hopper
40e06fccb8 convert: Add convert.cvsps option to set up an alternate cvsps command line. 2008-03-17 12:41:14 -07:00
Mikkel Fahnøe Jørgensen
9cd04d5249 cleanup monotone conversion and use commandline class 2008-02-03 16:14:05 +01:00
Mikkel Fahnøe Jørgensen
c3353ce9f9 initial version of monotone source for convert extension 2008-02-02 19:14:59 +01:00
Benoît Allard
5ca67f708d notify: print diffstat even if maxline == 0 2008-03-20 16:42:51 +01:00
Thomas Arendsen Hein
8064adc9b8 Spacing cleanup 2008-03-16 23:24:53 +01:00
Patrick Mezard
f51cfe018c convert: avoid querying log of foreign svn branches
Server configuration may prevent access to other branches, so don't even try to
get them, instead of ignoring them afterwards.
2008-03-16 00:35:14 +01:00
Christian Ebert
054ab4657a win32text: use util.binary to detect \0 2008-03-13 10:42:46 +01:00
Bryan O'Sullivan
fe8ea9f17a Automated merge with http://hg.intevation.org/mercurial/crew 2008-03-12 15:31:10 -07:00
Bryan O'Sullivan
08dc4f9063 Add inotify extension 2008-03-12 15:30:11 -07:00
Patrick Mezard
b31dc66c25 convert: rename MAPFILE into REVMAP to disambiguate with filemap 2008-03-12 23:21:01 +01:00
Matt Mackall
555abf8390 dates: improve timezone handling
datestr:
- add format specifiers %1 and %2 for timezone hours and minutes
- remove timezone and timezone format options
- correctly find timezone hours and minutes for fractional and negative timezones
- update users

strdate:
- correctly find timezone hours and minutes for fractional and negative timezones
2008-03-11 17:42:41 -05:00
Matt Mackall
865487e7f2 revlog: report node and file when lookup fails 2008-03-11 17:42:29 -05:00
Bryan O'Sullivan
f9f5e47a2f fetch: don't proceed if working directory is missing files (issue988) 2008-03-11 11:38:12 -07:00
Bryan O'Sullivan
a26a2d3c66 fetch: rename --force-editor option to --edit, for consistency 2008-03-11 11:30:42 -07:00
Joel Rosdahl
c26213193c Avoid importing mercurial.node/mercurial.repo stuff from mercurial.hg 2008-03-06 22:51:16 +01:00
Joel Rosdahl
bd755ed723 convert: Remove unused clone method 2008-03-06 22:23:41 +01:00
Joel Rosdahl
2cc739b2aa convert: Fix unbound name error in the subversion backend 2008-03-06 22:23:41 +01:00
Joel Rosdahl
9c3f9d4bd6 imerge: Fix unbound name error and add a test case 2008-03-06 22:23:41 +01:00
Joel Rosdahl
4f8012378a Remove unused imports 2008-03-06 22:23:41 +01:00
Joel Rosdahl
5dae3059a0 Expand import * to allow Pyflakes to find problems 2008-03-06 22:23:26 +01:00
Thomas Arendsen Hein
deb94bc7fe Removed trailing spaces from everything except test output 2008-03-07 00:24:36 +01:00
Bryan O'Sullivan
7ccd4e897d fetch: make test reproducible, tiny code cleanup 2008-03-05 09:20:57 -08:00
Bryan O'Sullivan
d160458ee9 fetch: switch the default parent used for a merge
This treats newly pulled changes as authoritative, and local changes as
the "satellite" changes.

The prior default behaviour is still available, via the --switch-parent
option.
2008-03-05 09:10:45 -08:00
Brendan Cully
4ef0063f6e highlight: forgot import 2008-02-29 14:48:21 -08:00
Brendan Cully
1ba6154655 highlight: guess by text when path name is ambiguous
Although the docs claim that guess_lexer_for_filename will fall back
to using file data, my ubuntu 7.10 pygments library seems to ignore
the text argument. So call guess_lexer explicitly on failure.
2008-02-29 14:47:07 -08:00
Brendan Cully
8d21038955 highlight: make div trimmer work when lexer fails to identify text.
In this case, there is no initial <span> tag.
2008-02-29 14:21:15 -08:00
Brendan Cully
bb081ab6da highlight: use iter() instead of generator comprehension 2008-02-29 11:13:50 -08:00
Dirkjan Ochtman
104e743dab mq: remove unimplemented option -f for strip 2008-02-29 09:54:28 +01:00
Brendan Cully
7978fadb5b highlight: bail out if file is binary 2008-02-28 22:04:22 -08:00
Brendan Cully
c74bac600d highlight: support annotate, and reduce layering violations. 2008-02-28 21:35:27 -08:00
Thomas Arendsen Hein
9f92f48ca6 Introduce templateopts and logopts to reduce duplicate option definitions. 2008-02-29 02:45:12 +01:00
Marti Raudsepp
e8713cc272 mq: Cleanup: update outdated file header. 2008-02-28 17:37:56 +02:00
Marti Raudsepp
ceefe77d88 convert: Clean up authormap key=value splitting.
Introduces a subtle parsing difference: dstauthor can now contain '='
characters.
2008-02-28 17:37:56 +02:00
Marti Raudsepp
40ade60f8b convert: Avoid redundant newline on authormap errors.
The extra rstrip is necessary in case the file has uses different line
terminators (i.e. CRLF).
2008-02-28 17:37:56 +02:00
Marti Raudsepp
c1c082f372 convert: Ignore empty lines in authormap file. 2008-02-28 17:37:56 +02:00
Patrick Mezard
1bee8eb741 convert: add shallow, single branch svn conversions via svn.startrev 2008-02-24 17:58:55 +01:00
Patrick Mezard
e6c6545487 convert: allow svn trunk/branches/tags detection to be skipped
- eluding convert.svn.branches defaults to "branches"
- convert.svn.branches= disables branches detection
- convert.svn.branches=/ is equivalent to former convert.svn.branches=
2008-02-24 17:58:53 +01:00
Patrick Mezard
613f127c0d convert: improve subversion source documentation 2008-02-23 16:43:33 +01:00
Peter Arrenbrecht
7d5130edff mq: make qclone ask remote source repo for qbase using lookup protocol 2008-02-21 23:00:50 +01:00
Thomas Arendsen Hein
66db9ab9a2 Document log date ranges and mention 'hg help dates' for all commands (issue998) 2008-02-22 21:18:48 +01:00
Alexis S. L. Carvalho
c028f52c83 keyword: remove "identify" and "remove" from nokwcommands
These two commands care about the list of modified files returned
by repo.status and we may need to do a full content comparison to
populate that list.
2008-02-21 16:22:31 -03:00
Bryan O'Sullivan
032bc4fcfa convert: document splicemap, allow setting of multiple parents 2008-02-19 10:53:40 -08:00
Thomas Arendsen Hein
a1c1677af4 Fix bad behaviour when specifying an invalid date (issue700)
commit (aborts _after_ typing in a commit message)
backout (aborted after the initial revert)
tag (edited .hgtags and couldn't commit)
import (patch applied, then commit fails)
qnew (aborts on bad dates, but writes any valid date into the # Date header)
qrefresh (like qnew)
sign (like tag)
fetch (merge, merge, merge, merge, abort)
2008-02-17 21:34:28 +01:00
Patrick Mezard
401c3763ae convert: improve cycles detection message 2008-02-16 11:55:33 +01:00
Patrick Mezard
c909c274fa Merge with crew-stable 2008-02-16 12:46:28 +01:00
Patrick Mezard
b6695538ff convert: fix --datesort ordering
Two branches a and b starting at root, with commits interleaved like:
root a0 a1 b0 a2 a3 b1
were converted in the following order:
root a0 b0 a1 b1 a2 a3

Replace depth based toposort with a more classic traversal method.
2008-02-16 11:55:33 +01:00