mpm@selenic.com [Sat, 27 Aug 2005 18:27:45 -0700] rev 1111
Add an old-http test case
This uses a trivial Python http server to test pulling from a static
http server.
mpm@selenic.com [Sat, 27 Aug 2005 18:11:32 -0700] rev 1110
Add a simple dummy ssh test
This uses the -e flag to run a dummy script rather than actual ssh to
test the protocol over a local pipe.
mpm@selenic.com [Sat, 27 Aug 2005 17:26:26 -0700] rev 1109
Merge with TAH
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 27 Aug 2005 23:36:25 +0200] rev 1108
Remove some options from 'hg grep':
-Z (we have -0 as in locate)
-a (use "-r 0:tip" instead, or always grep all unless -r is given)
-e (we have the PATTERN argument)
-v (doesn't work, and this is more of a job for 'hg cat|grep')
-s (we have -q/--quiet)
-f (should be always enabled if -l used, or enable on -v/--verbose)
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 27 Aug 2005 23:35:30 +0200] rev 1107
Adjusted test-help for change to hg status.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 27 Aug 2005 23:25:55 +0200] rev 1106
Whitespace cleanup.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 27 Aug 2005 23:23:32 +0200] rev 1105
Replaced hg status -p/--strip with -n/--no-status to not confuse with patch.
mpm@selenic.com [Sat, 27 Aug 2005 16:42:03 -0700] rev 1104
Fix dirstate imports
mpm@selenic.com [Sat, 27 Aug 2005 16:40:24 -0700] rev 1103
Fix sshrepo imports
mpm@selenic.com [Sat, 27 Aug 2005 16:34:54 -0700] rev 1102
localrepo: minor opener usage restructuring
mpm@selenic.com [Sat, 27 Aug 2005 16:28:53 -0700] rev 1101
Separate out old-http support
- create new statichttprepo class
- pull remote bits out of localrepo
- pull remote bits out of util.opener
- switch hg.repository to use statichttprepo
mpm@selenic.com [Sat, 27 Aug 2005 15:35:37 -0700] rev 1100
localrepo: more import/namespace tidying
mpm@selenic.com [Sat, 27 Aug 2005 15:19:36 -0700] rev 1099
Minor import fixups
mpm@selenic.com [Sat, 27 Aug 2005 15:13:52 -0700] rev 1098
manifest: convert sys.stderr bits to AssertionError
mpm@selenic.com [Sat, 27 Aug 2005 15:09:46 -0700] rev 1097
localrepo: adjust some imports, remove sys dependency
mpm@selenic.com [Sat, 27 Aug 2005 15:05:59 -0700] rev 1096
sshrepo: adjust file comment
mpm@selenic.com [Sat, 27 Aug 2005 15:05:43 -0700] rev 1095
changelog: adjust imports, comment
mpm@selenic.com [Sat, 27 Aug 2005 14:59:25 -0700] rev 1094
Adjust some imports
mpm@selenic.com [Sat, 27 Aug 2005 14:56:58 -0700] rev 1093
commands: use revlog directly for debug commands
This eliminates the import in hg.py
mpm@selenic.com [Sat, 27 Aug 2005 14:55:07 -0700] rev 1092
commands: use node functions directly
mpm@selenic.com [Sat, 27 Aug 2005 14:43:20 -0700] rev 1091
Move hash function back to revlog from node
mpm@selenic.com [Sat, 27 Aug 2005 14:31:41 -0700] rev 1090
Move opener to utils
- move the opener code down to util
- add docstring
- change commands.py users to simply use file instead
mpm@selenic.com [Sat, 27 Aug 2005 14:21:25 -0700] rev 1089
Break apart hg.py
- move the various parts of hg.py into their own files
- create node.py to store node manipulation functions
TK Soh <teekaysoh@yahoo.com> [Sat, 27 Aug 2005 12:00:12 -0700] rev 1088
updated manpage for new options of status
mpm@selenic.com [Sat, 27 Aug 2005 01:55:10 -0700] rev 1087
hgweb: add catch for connection reset
suggested by Jeff Sipek
mpm@selenic.com [Sat, 27 Aug 2005 01:50:18 -0700] rev 1086
Fix up help test
TK Soh <teekaysoh@yahoo.com> [Sat, 27 Aug 2005 01:49:41 -0700] rev 1085
status: added option -p and -0 to assist xargs
The -p option strips the status prefix of each file, while
-0 ends each file with a NUL character, instead of a newline.
Together, selected group of files can be passed to 'xargs -0'
for further processing.
TK Soh <teekaysoh@yahoo.com> [Sat, 27 Aug 2005 01:49:35 -0700] rev 1084
updated manpage on global options and typo fix.
mpm@selenic.com [Sat, 27 Aug 2005 01:43:48 -0700] rev 1083
Add some docstrings to revlog.py
mpm@selenic.com [Sat, 27 Aug 2005 01:13:28 -0700] rev 1082
Update util.py docstrings, fix walk test
mpm@selenic.com [Fri, 26 Aug 2005 23:29:10 -0700] rev 1081
Change canonpath to not know about repo objects
Code in util should not have any knowledge about repo objects
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 27 Aug 2005 08:22:10 +0200] rev 1080
Updated list of contributors.
mpm@selenic.com [Fri, 26 Aug 2005 20:56:50 -0700] rev 1079
Document archive download options
mpm@selenic.com [Fri, 26 Aug 2005 20:52:31 -0700] rev 1078
Various cleanups for tarball support
s/tarball/archive/
query config rather than maintaining a list
default all archive support to off
use changeset nodes rather than manifest nodes
use web:name for archive name
don't use rev number in filename, it's not portable
refactor manifest lookup bits
use finally: clause to delete tmpfile
Wojciech Milkowski <wmilkowski@interia.pl> [Fri, 26 Aug 2005 20:51:48 -0700] rev 1077
tarball support v0.3 pt 2
Wojciech Milkowski <wmilkowski@interia.pl> [Fri, 26 Aug 2005 20:51:34 -0700] rev 1076
tarball support v0.3
Hello,
I'm slowly improving support for tarballs in Mercurial. Attached patch
is made against current tip in Matt's repository - f859e9cba1b9, and
contains everything done so far.
Changes:
- gzip and bzip2 tarballs are sent immediately without writing to
temporary files (I was wrong Matt, it can be done very easy)
- hgrc customization, you can choose which type (if any) you will support
There's no easy way to support compression levels, since TarFile open()
assume that it is 9. I tried to use gzopen(), and bz2open() methods
instead, but it seems that headers of generated archives, are missing or
wrong. We could eventually try to rewrite tarfile.py and include our own
version into Mercurial, but I don't know if it's good idea...
Wojtek
Volker.Kleinfeld@gmx.de [Fri, 26 Aug 2005 19:20:04 -0700] rev 1075
Fixed system command abord reason on windows.
mason@suse.com [Fri, 26 Aug 2005 19:19:35 -0700] rev 1074
Add revlog.reachable to find a graph of ancestors for a given rev
Bart Trojanowski <bart@jukie.net> [Fri, 26 Aug 2005 19:08:25 -0700] rev 1073
[PATCH] raise exceptions with Exception subclasses
Fixed the patch. Using Exception subclasses.
(tweaked by mpm)
mpm@selenic.com [Fri, 26 Aug 2005 16:49:23 -0700] rev 1072
Fixes for push corner case
TAH found a bug where push would push things the remote already had,
raising an assertion. This turned out to be because the changeset
protocol was not recording a common subset node in one case.
Also discovered was that the protocol was queueing multiple copies of
a node for pull. Fixed by changing fetch to a hash.
Add some more debugging output.
mason@suse.com [Fri, 26 Aug 2005 14:05:52 -0700] rev 1071
Add support for extension modules
This adds support for an [extensions] section to hgrc. This has the form of:
[extensions]
mod=[path]
If a path is specified, the python module found at that path is load.
Otherwise, __import__ is used to find the module.
Each module must implement a dict called cmdtable where the command line
options for that module live. Each module must also implement a reposetup
function:
cmdtable = {}
def reposetup(ui, repo): pass
Index: hg/mercurial/ui.py
===================================================================
mpm@selenic.com [Fri, 26 Aug 2005 13:59:14 -0700] rev 1070
hgwebdir index: change "author" to "contact"
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 22:40:56 +0200] rev 1069
Allow using a ssh repository without a path.
This uses the home directory on the remote side or the directory
specified in the command in .ssh/authorized_keys
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 16:47:09 +0200] rev 1068
Fixed synopsis for grep command.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 16:37:28 +0200] rev 1067
Fixed zero-padded filenames with %r if there is a longer number in the middle.
e.g. with: hg export -o ../%r.patch 99 100 98
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 15:26:44 +0200] rev 1066
Shortened commands.revrange() a little bit, added docstring.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 15:19:18 +0200] rev 1065
Cleanups to commands.py
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 13:31:40 +0200] rev 1064
Removed obsolete imports from hgwebdir.cgi
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 13:29:52 +0200] rev 1063
Some more spacing/indentation/linebreak cleanups to hgweb.py.
benoit.boissinot@ens-lyon.fr [Fri, 26 Aug 2005 13:06:58 +0200] rev 1062
pep-0008 cleanup
- Don't use spaces around the '=' sign when used to indicate a
keyword argument or a default parameter value.
mpm@selenic.com [Fri, 26 Aug 2005 02:03:35 -0700] rev 1061
Fix set type usage for Python 2.3
mpm@selenic.com [Fri, 26 Aug 2005 01:56:49 -0700] rev 1060
Merge from BOS, fix help
bos@serpentine.internal.keyresearch.com [Thu, 25 Aug 2005 17:13:48 -0700] rev 1059
grep: speed up matching, and only return one match per line.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 25 Aug 2005 10:11:54 -0700] rev 1058
Use ui.write instead of print in debugwalk.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 25 Aug 2005 02:00:03 -0700] rev 1057
Add grep command.
It currently searches all revs of every matching file. I'll change
this soon so that it can still do this, but it will not be the default
behaviour.
Many options are unimplemented. There's only one output mode. Binary
files are not handled yet.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 24 Aug 2005 22:25:55 -0700] rev 1056
Map long option names containing dashes to ones containing underscores.
mpm@selenic.com [Fri, 26 Aug 2005 01:51:44 -0700] rev 1055
Minor test-help fix
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 10:39:43 +0200] rev 1054
Fixed some synopsises in command help.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 10:01:55 +0200] rev 1053
Added missing doc strings for two new debug commmands.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 09:56:33 +0200] rev 1052
Adjust display and alignment of command options to match global options.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 09:15:04 +0200] rev 1051
Clean up displaying help of global options, only one row per option.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 08:47:43 +0200] rev 1050
Moved --cwd handling to a place where ui and exception handling already exists.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 08:42:56 +0200] rev 1049
Allow --help and --version being used together.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 08:37:41 +0200] rev 1048
Added options -h/--help.
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 26 Aug 2005 08:26:21 +0200] rev 1047
Moved special handling of --version and no hg command from parse to dispatch.
This allows e.g. 'hg status --version' to work.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 25 Aug 2005 18:35:35 +0200] rev 1046
Sort global options by topic: directories, ui, timing, other
(and changed indentation to match command table)
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 25 Aug 2005 18:25:19 +0200] rev 1045
run the doc/* through aspell.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 25 Aug 2005 16:00:08 +0200] rev 1044
Removed forgotten debug print statement from commands.py and tests.
mpm@selenic.com [Wed, 24 Aug 2005 19:19:35 -0700] rev 1043
Update tests
mpm@selenic.com [Wed, 24 Aug 2005 19:16:45 -0700] rev 1042
Fix a couple fencepost errors in hg log
mpm@selenic.com [Wed, 24 Aug 2005 18:45:49 -0700] rev 1041
Fix hg log -p
mpm@selenic.com [Wed, 24 Aug 2005 18:42:42 -0700] rev 1040
Show number of new heads when doing a pull
mpm@selenic.com [Wed, 24 Aug 2005 18:40:17 -0700] rev 1039
Add debugdata for dumping revlog revision data
bos@eng-25.internal.keyresearch.com [Wed, 24 Aug 2005 14:46:02 -0700] rev 1038
Merge with MPM.
bos@serpentine.internal.keyresearch.com [Wed, 24 Aug 2005 14:45:35 -0700] rev 1037
Fix a small corner of log behaviour.
If invoked with no arguments in a subdirectory of the repo root, it
should print the history of the repository as a whole.
mpm@selenic.com [Wed, 24 Aug 2005 14:24:20 -0700] rev 1036
Update hg log docs
mpm@selenic.com [Wed, 24 Aug 2005 13:31:46 -0700] rev 1035
Merge with BOS
Bryan O'Sullivan <bos@serpentine.com> [Wed, 24 Aug 2005 13:26:45 -0700] rev 1034
Fix help output, and a few broken tests.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 24 Aug 2005 12:50:11 -0700] rev 1033
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 24 Aug 2005 12:43:09 -0700] rev 1032
Get patchbomb working with tip again.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 24 Aug 2005 12:39:10 -0700] rev 1031
Rewrite log command. New version is faster and more featureful.
The original implementation of log walked backwards through history,
which had terrible behaviour. It took several minutes to view
complete kernel change history on a fast machine, for example.
The rewrite uses a windowed approach to walk hunks of history
forwards, while still giving results in reverse order. This reduces
run time from five minutes to five seconds on my system.
In addition, the rewrite uses our normal name handling mechanisms, so
you can run a command like "hg log net/ipv4/**.c" and get a useful
answer. It optimises for three different cases (no arguments, only
files, and anything goes), so it performs well in all circumstances
I've tested.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 21:57:22 -0700] rev 1030
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 21:53:13 -0700] rev 1029
Emacs: implement hg-incoming, hg-outgoing and hg-push.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 21:30:12 -0700] rev 1028
Add commands.debugconfig.
This lets us both view the actual config data that hg is using, and
drive editors that need to see this information.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 16:46:10 -0700] rev 1027
Emacs: fix up hg-log and hg-diff to operate more uniformly.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 15:42:06 -0700] rev 1026
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 23 Aug 2005 15:30:06 -0700] rev 1025
Merge with MPM.
bos@serpentine.internal.keyresearch.com [Tue, 23 Aug 2005 15:27:17 -0700] rev 1024
Sync buffers prior to doing a diff.
mpm@selenic.com [Wed, 24 Aug 2005 03:33:54 -0700] rev 1023
Minor tweak to the revgen algorithm
mpm@selenic.com [Wed, 24 Aug 2005 03:32:08 -0700] rev 1022
Minor hgwebdir tweaks
- ignore / for PATH_INFO
- fix // in URLs
mpm@selenic.com [Wed, 24 Aug 2005 00:38:36 -0700] rev 1021
Add Makefile to the manifest
mpm@selenic.com [Wed, 24 Aug 2005 00:36:12 -0700] rev 1020
Add default make rule
The default make rule builds the extensions "in-place" so that hg can
be run out of the working directory.
mpm@selenic.com [Wed, 24 Aug 2005 00:32:10 -0700] rev 1019
Create helper functions for I/O to files in the working directory
This simplifies some code and gives us a single place to add I/O
filters.
mpm@selenic.com [Wed, 24 Aug 2005 00:12:04 -0700] rev 1018
Add some aliases
mpm@selenic.com [Wed, 24 Aug 2005 00:09:56 -0700] rev 1017
Fix up help for binary options
mpm@selenic.com [Tue, 23 Aug 2005 20:21:52 -0700] rev 1016
Teach annotate about binary files
mpm@selenic.com [Tue, 23 Aug 2005 19:58:46 -0700] rev 1015
Add automatic binary file detection to diff and export
Based on a patch by Fuming Wang
- add util.binary which decides whether a file is binary if it has any NUL
characters in the first 1K.
- teach mdiff.unidiff to print "binary file <x> has changed" for binary files
- add text flag to cause unidiff and dodiff to treat all files as text
- add -a and --text flags (like diff(1)) to hg diff and export
- update docs
mpm@selenic.com [Tue, 23 Aug 2005 18:58:26 -0700] rev 1014
Clean up argument passing for dodiff
mpm@selenic.com [Tue, 23 Aug 2005 16:19:14 -0700] rev 1013
Deal with repos with missing timezones
mpm@selenic.com [Tue, 23 Aug 2005 15:15:14 -0700] rev 1012
Merge with BOS
bos@serpentine.internal.keyresearch.com [Tue, 23 Aug 2005 14:51:52 -0700] rev 1011
Emacs: search for hg in path before looking in funny places.
mpm@selenic.com [Tue, 23 Aug 2005 14:21:19 -0700] rev 1010
Merge with TAH
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 22 Aug 2005 19:56:52 +0200] rev 1009
Don't show the diff in hgeditor if there are no changes in file contents.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 22 Aug 2005 08:46:43 +0200] rev 1008
Add Makefile for generating release tarballs.
- test suite is run
- documentation is generated and included
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 22 Aug 2005 08:39:44 +0200] rev 1007
Include generated documentation in MANIFEST.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 22 Aug 2005 08:33:02 +0200] rev 1006
Generate html documentation by default, too.
mpm@selenic.com [Tue, 23 Aug 2005 14:20:17 -0700] rev 1005
Merge with BOS
bos@serpentine.internal.keyresearch.com [Mon, 22 Aug 2005 15:29:55 -0700] rev 1004
Emacs: improved GNU Emacs support.
bos@serpentine.internal.keyresearch.com [Mon, 22 Aug 2005 15:08:20 -0700] rev 1003
Emacs support: numerous changes.
Most SCM commands now work in derived buffers (e.g. diff viewing
buffers) as well as buffers backed by files.
diff and log now work properly on repositories and files.
Commit support is more solid.
Doc strings are better.
bos@eng-25.internal.keyresearch.com [Mon, 22 Aug 2005 13:06:43 -0700] rev 1002
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 22 Aug 2005 03:41:09 -0700] rev 1001
Emacs: update mode lines properly after commit.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 22 Aug 2005 03:27:27 -0700] rev 1000
Emacs: kill commit buffer once it's done with.
Bryan O'Sullivan <bos@serpentine.com> [Mon, 22 Aug 2005 03:16:32 -0700] rev 999
Emacs: first cut at commit support.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 21 Aug 2005 23:33:02 -0800] rev 998
contrib/patchbomb: Fix buglet with empty cc list.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 21 Aug 2005 23:03:14 -0800] rev 997
Fix handling of addresses in hgrc.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 21 Aug 2005 22:46:57 -0800] rev 996
Emacs: document existing functions.
Bryan O'Sullivan <bos@serpentine.com> [Sun, 21 Aug 2005 21:51:01 -0800] rev 995
Emacs support: add hg-revert-buffer.
mpm@selenic.com [Tue, 23 Aug 2005 12:46:43 -0700] rev 994
Fix callers to file.revision to use file.read
This was causing unchanged files to show up as modified.
mpm@selenic.com [Tue, 23 Aug 2005 02:19:38 -0700] rev 993
Clean up some merge logic
- rename mode to branch_merge
- use explicit update mode
- use negative mtime for updates that set mtime
- expand some cryptic variable names
- elaborate merge dirstate comments
- remove redundant manifest lookup for non-merge case
- remove impossible merge case
- fix up test cases
mpm@selenic.com [Mon, 22 Aug 2005 01:22:29 -0700] rev 992
Fix up some bugs introduced by recent merge changes
- use new changed list to track what files actually got new revlog entries
at commit/rawcommit time
- when updating a file during a merge, don't mark it as completely unchanged
- handle file not being in parent 1 in status
mpm@selenic.com [Sun, 21 Aug 2005 22:03:36 -0700] rev 991
merge: remove remaining mark bits
mpm@selenic.com [Sun, 21 Aug 2005 21:59:55 -0700] rev 990
Fix long-standing excessive file merges
Since switching to the multihead approach, we've been creating
excessive file-level merges where files are marked as merged with
their ancestors.
This explicitly checks at commit time whether the two parent versions
are linearly related, and if so, reduces the file check-in to a
non-merge. Then the file is compared against the remaining parent,
and, if equal, skips check-in of that file (as it's not changed).
Since we're not checking in all files that were different between
versions, we no longer need to mark so many files for merge. This
removes most of the 'm' state marking as well.
Finally, it is possible to do a tree-level merge with no file-level
changes. This will happen if one user changes file A and another
changes file B. Thus, if we have have two parents, we allow commit to
proceed even if there are no file-level changes.
mpm@selenic.com [Sun, 21 Aug 2005 16:51:50 -0700] rev 989
Reformat debugindex output
mpm@selenic.com [Sun, 21 Aug 2005 16:00:07 -0700] rev 988
Remove unused relfilter function
mpm@selenic.com [Sun, 21 Aug 2005 15:56:14 -0700] rev 987
hgweb: change startup argument processing
- allow passing a repo object instead of a path
(if we get a string, we construct a repo object)
- hg serve: pass options via repo.ui.setconfig
- add --style option
- get default name from repo.root rather than getcwd()
- remove template argument to hgweb()
- reduce create_server from 8 args to 1
mpm@selenic.com [Sun, 21 Aug 2005 15:00:02 -0700] rev 986
Add web:style option
mpm@selenic.com [Sun, 21 Aug 2005 13:18:45 -0700] rev 985
hgweb: fix RSS and raw for new % scheme
mpm@selenic.com [Sun, 21 Aug 2005 11:52:52 -0700] rev 984
Remove debug print
mpm@selenic.com [Sun, 21 Aug 2005 11:46:39 -0700] rev 983
Fix RSS feeds
mpm@selenic.com [Sat, 20 Aug 2005 13:11:36 -0700] rev 982
hgweb: convert index entries to list expansion style
mpm@selenic.com [Sat, 20 Aug 2005 13:08:07 -0700] rev 981
Merge with jeffpc
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 22:59:47 -0500] rev 980
Merge with MPM
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 22:32:47 -0500] rev 979
hgweb: Changed manifest page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 22:08:15 -0500] rev 978
hgweb: Changed file revision page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 22:03:28 -0500] rev 977
hgweb: Changed annotate page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 21:59:02 -0500] rev 976
hgweb: Changed file page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 21:45:44 -0500] rev 975
hgweb: Changed changelog page to list format syntax
Josef "Jeff" Sipek <jeffpc@optonline.net> [Wed, 17 Aug 2005 21:14:20 -0500] rev 974
Added support for #foo%bar# syntax
This required moving template() into the templater class
mpm@selenic.com [Sat, 20 Aug 2005 11:59:10 -0700] rev 973
Deal with non-integer date offsets generated by some tools
mpm@selenic.com [Sat, 20 Aug 2005 01:46:57 -0700] rev 972
Added tag 0.6c for changeset eac9c8efcd9bd8244e72fb6821f769f450457a32
mpm@selenic.com [Sat, 20 Aug 2005 01:35:45 -0700] rev 971
Remove call to non-existent date_parser
mpm@selenic.com [Sat, 20 Aug 2005 01:29:04 -0700] rev 970
Fix possible unitialized variable warnings
mpm@selenic.com [Sat, 20 Aug 2005 00:49:41 -0700] rev 969
Minor README updates
Samuel Tardieu <sam@rfc1149.net> [Fri, 19 Aug 2005 23:26:32 -0800] rev 968
[PATCH] Take DST into account
Right now, mercurial doesn't take daylight saving time into account
because it uses time.timezone inconditionally, instead of resorting to
time.altzone if daylight saving time is on.
Samuel Tardieu <sam@rfc1149.net> [Fri, 19 Aug 2005 23:23:42 -0800] rev 967
[PATCH] Print timezone offset when outputting dates
Example:
% hg log | head -12
changeset: 791:41440890e57d2dbacde03a2a114e5114a031ea4a
tag: tip
user: Samuel Tardieu <sam@rfc1149.net>
date: Mon Jul 25 13:24:15 2005 +0200
summary: Parse various date formats when accepting user specified dates
[...]
changeset: 787:ba5c2021364ee876dae170e8f153e43bd0b2bd73
parent: 785:31a80e3723cee0a5991340facb2707e71983eb41
user: Bryan O'Sullivan <bos@serpentine.com>
date: Sun Jul 24 00:39:24 2005 -0800
summary: Get "forget" command to use new walk code.
[...]
mpm@selenic.com [Fri, 19 Aug 2005 23:07:31 -0800] rev 966
hg import: abort with uncommitted changes, override with --force
mpm@selenic.com [Fri, 19 Aug 2005 22:48:43 -0800] rev 965
Use post-expanded clone pathname as default
mpm@selenic.com [Fri, 19 Aug 2005 22:12:40 -0800] rev 964
hgweb: Make maxfiles, maxchanges, and allowpull proper config options
mpm@selenic.com [Fri, 19 Aug 2005 22:11:48 -0800] rev 963
Add -e and --remotecmd for clone and pull too
mpm@selenic.com [Fri, 19 Aug 2005 21:47:46 -0800] rev 962
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com [Fri, 19 Aug 2005 21:36:57 -0800] rev 961
Add --ssh and --remotecmd to push
This uses the new setconfig options passing mechanism
mpm@selenic.com [Fri, 19 Aug 2005 21:25:25 -0800] rev 960
Add ui.setconfig overlay
This can simplify option passing
mpm@selenic.com [Fri, 19 Aug 2005 18:56:20 -0800] rev 959
Fix option parsing bug for empty short options
mpm@selenic.com [Fri, 19 Aug 2005 18:47:05 -0800] rev 958
Make mercurial.el load with GNU emacs
mpm@selenic.com [Fri, 19 Aug 2005 17:22:04 -0800] rev 957
hgweb: sort repository list
mpm@selenic.com [Fri, 19 Aug 2005 17:01:11 -0800] rev 956
Fix hgwebdir virtual start-up
mpm@selenic.com [Fri, 19 Aug 2005 16:51:44 -0800] rev 955
Remove -C alias for --cwd
mpm@selenic.com [Fri, 19 Aug 2005 16:46:31 -0800] rev 954
Add hgwebdir.cgi to MANIFEST.in
mpm@selenic.com [Fri, 19 Aug 2005 16:45:25 -0800] rev 953
Merge with TAH
TK Soh <teekaysoh@yahoo.com> [Fri, 19 Aug 2005 06:04:46 +0100] rev 952
bash_completion: support GNU sed 3 and non-GNU sed
replaced command 'Q' introduced in GNU sed 4, in order to support
platforms with older sed.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 18 Aug 2005 21:35:36 +0100] rev 951
Read global config file /etc/mercurial/hgrc and fix reading hgrc on Windows.
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 18 Aug 2005 13:55:45 +0100] rev 950
Removed TODO from MANIFEST.in
TK Soh <teekaysoh@yahoo.com> [Thu, 18 Aug 2005 13:33:39 +0100] rev 949
test fixes for Solaris 2.6
Solaris 2.6's stock sed doesn't support alternatives in regular
expression. We workaround by breaking up the regexp.
mpm@selenic.com [Fri, 19 Aug 2005 16:43:30 -0800] rev 948
Merge with BOS
Bryan O'Sullivan <bos@serpentine.com> [Fri, 19 Aug 2005 06:41:29 -0800] rev 947
In-progress Emacs snapshot.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 18 Aug 2005 17:49:43 -0800] rev 946
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 18 Aug 2005 12:32:15 -0800] rev 945
Merge with MPM.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 18 Aug 2005 12:27:57 -0800] rev 944
Initial skeleton for mercurial.el.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 18 Aug 2005 14:58:14 -0800] rev 943
Add --cwd global option, to change directory before doing anything.
Useful for interacting with a program presenting a UI, such as Emacs.
Bryan O'Sullivan <bos@serpentine.com> [Thu, 18 Aug 2005 13:58:32 -0800] rev 942
Modify commands.walk to yield a 4-tuple.
The new element of the tuple indicates whether a name is an exact match
for one passed in on the command line.
mpm@selenic.com [Fri, 19 Aug 2005 16:38:25 -0800] rev 941
Add a multi-repository server
This merges a bunch of the ideas for a multi-repository CGI script and
simplifies things a bit.
It uses PATH_INFO so it generally wants paths of the form:
http://host/hg.cgi/virtualpath
This gets mapped via a simple config file to the real path. All info
about the repo is read from the repo's hgrc.
mpm@selenic.com [Wed, 17 Aug 2005 18:52:27 -0800] rev 940
Add in and out aliases
mpm@selenic.com [Wed, 17 Aug 2005 18:41:04 -0800] rev 939
Fix stray debug statement
mpm@selenic.com [Wed, 17 Aug 2005 17:57:37 -0800] rev 938
hgweb: add [web] section to hgrc
This makes almost all of the hgweb settings available in hgrc.
mpm@selenic.com [Wed, 17 Aug 2005 16:37:04 -0800] rev 937
Whitespace
mpm@selenic.com [Wed, 17 Aug 2005 12:26:06 -0800] rev 936
Add a simple remove test
mpm@selenic.com [Wed, 17 Aug 2005 12:22:12 -0800] rev 935
bash: Add smarter completion of add/commit/remove/forget/diff/revert
Use hg status to determine which files are interesting for various commands.
Thus, hg add [tab] finds unknown files, and hg commit [tab] finds added, modified, or removed files.
mpm@selenic.com [Wed, 17 Aug 2005 00:36:36 -0800] rev 934
Fix path handling for deleting files on merge
tksoh@users.sf.net [Wed, 17 Aug 2005 00:33:53 -0800] rev 933
Fixed --repository option when handling relative path
When specifying relative path to --repository option, 'log' and
'diff' were unable to find the files specified. Here's the fix.
mpm@selenic.com [Tue, 16 Aug 2005 23:49:53 -0800] rev 932
The TODO and the FAQ now live on the Wiki
mpm@selenic.com [Tue, 16 Aug 2005 22:47:49 -0800] rev 931
Fix incoming for empty set
mpm@selenic.com [Tue, 16 Aug 2005 21:33:50 -0800] rev 930
Fix incoming help test again
mpm@selenic.com [Tue, 16 Aug 2005 19:31:30 -0800] rev 929
Add incoming to completions
mpm@selenic.com [Tue, 16 Aug 2005 19:27:46 -0800] rev 928
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com [Tue, 16 Aug 2005 19:17:16 -0800] rev 927
Add hg incoming command for local repositories
mpm@selenic.com [Tue, 16 Aug 2005 19:17:01 -0800] rev 926
Add a local() method to repository classes
mpm@selenic.com [Tue, 16 Aug 2005 19:03:01 -0800] rev 925
run-tests: remove '+ hg' trick
This was causing me a fair amount of debugging confusion. Let's just
forget it entirely. Updated tests to match.
TK Soh <teekaysoh@yahoo.com> [Tue, 16 Aug 2005 17:30:41 -0800] rev 924
updated help text and added manpage section for hg paths
Index: hg/doc/hg.1.txt
===================================================================
mpm@selenic.com [Tue, 16 Aug 2005 17:12:25 -0800] rev 923
Add basic https support for pull
mpm@selenic.com [Tue, 16 Aug 2005 15:55:33 -0800] rev 922
Teach bash_completion about outgoing
mpm@selenic.com [Tue, 16 Aug 2005 15:50:42 -0800] rev 921
show_changeset: -q shows short hash
mpm@selenic.com [Tue, 16 Aug 2005 15:49:26 -0800] rev 920
Add hg outgoing command
mpm@selenic.com [Tue, 16 Aug 2005 15:30:26 -0800] rev 919
whitespace cleanup
mpm@selenic.com [Tue, 16 Aug 2005 15:22:44 -0800] rev 918
hg cat: accept changeset hashes
mpm@selenic.com [Tue, 16 Aug 2005 14:53:47 -0800] rev 917
Fix hg clone race with writer
Most read operations in hg don't need locks because we order reads and
writes for consistency. Clone is an exception to this as we're copying
entire file histories and could end up with more file history copied
than we have commits.
For now, make clone take a lock on the source repo. Non-hardlinked
clone should eventually be changed to use lockless pull.
mpm@selenic.com [Tue, 16 Aug 2005 14:17:27 -0800] rev 916
Add bash_completion to contrib
Contributed by "Alexis S. L. Carvalho" <alexis@cecm.usp.br>
Attached is a file that implements bash completion for hg. Just
reading it from your .bashrc should be enough to use it - I think: I'm
using the /etc/bash_completion from debian and I'm not sure whether it
sets some important option.
It gets the list of commands, aliases and options from the output of hg
help and then adds some specific stuff - e.g. completing update with
tags; pull and push with path aliases and directories, etc.
mpm@selenic.com [Tue, 16 Aug 2005 13:52:28 -0800] rev 915
Let hg paths work outside of repositories
mpm@selenic.com [Tue, 16 Aug 2005 10:44:04 -0800] rev 914
Fix up help test
TK Soh <teekaysoh@yahoo.com> [Tue, 16 Aug 2005 10:42:30 -0800] rev 913
typo fix in command help text
This patch fixes a few typo errors on the command help output
(I am not sure if the change on 'diff' is the best though).
mark.williamson@cl.cam.ac.uk [Mon, 15 Aug 2005 11:46:41 -0800] rev 912
Minor tweak: os.STOPSIG -> os.WSTOPSIG. Pychecker spotted this one.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 15 Aug 2005 08:08:11 +0100] rev 911
Fix .hgignore parsing if last line has no EOL, ignore trailing white space.
(and don't use tabs in python code)
mpm@selenic.com [Sun, 14 Aug 2005 22:00:16 -0800] rev 910
Merge with TAH
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 15 Aug 2005 06:58:25 +0100] rev 909
Addes test for error messages when operating on non-existing files.
mpm@selenic.com [Sun, 14 Aug 2005 21:36:08 -0800] rev 908
Fix tests for new init command
Bryan O'Sullivan <bos@serpentine.com> [Sun, 14 Aug 2005 21:33:09 -0800] rev 907
Modify init command to take an optional directory to set up.
If the directory does not exist, it is created.
If no directory is given, the current directory is used.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 15 Aug 2005 06:18:49 +0100] rev 906
Update synopsis for 'hg update', too.
Thomas Arendsen Hein <thomas@intevation.de> [Mon, 15 Aug 2005 05:22:40 +0100] rev 905
Update online help of hg heads for new --branches option.
mason@suse.com [Sun, 14 Aug 2005 20:09:32 -0800] rev 904
Add optional parameter for changed/added/del/unknown files to commands.dodiff
This makes it possible to avoid a call into repo.changes if the details
of what has changed is already known
mason@suse.com [Sun, 14 Aug 2005 20:09:21 -0800] rev 903
Allow the changegroup generator to completely load the buffer.
This makes is possible to delete or truncate away revisions and still
use the changegroup later.
mason@suse.com [Sun, 14 Aug 2005 20:09:09 -0800] rev 902
Add optional stop revision to revlog.heads
mason@suse.com [Sun, 14 Aug 2005 20:09:01 -0800] rev 901
Change repo.comit to return None on error or the new revision number on
success
This allows the caller to correctly record the new revision number
mason@suse.com [Sun, 14 Aug 2005 20:08:35 -0800] rev 900
Add force option to repo.commit, allowing commits where no files change
mark.williamson@cl.cam.ac.uk [Sun, 14 Aug 2005 12:30:01 -0800] rev 899
Add '-' support to the commit logfile option to read message from stdin.
mason@suse.com [Sun, 14 Aug 2005 12:23:45 -0800] rev 898
Add searching for named branches
named branching is when you identify a head by a tag on an earlier revision.
This patch adds repo.branchlookup for searching through the tree to
find branch tags for heads.
hg update -b tag is added to checkout based on branch tags
hg heads -b is added to print the tag associated with each head
mpm@selenic.com [Sun, 14 Aug 2005 12:23:36 -0800] rev 897
Fix bug with empty inc and exc
This fixes an exception that showed up when importing patches
mpm@selenic.com [Sat, 13 Aug 2005 19:43:42 -0800] rev 896
Merge with BOS
Bryan O'Sullivan <bos@serpentine.com> [Sat, 13 Aug 2005 15:26:32 -0800] rev 895
Merge walk changes with Matt's tip.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 13 Aug 2005 15:23:06 -0800] rev 894
Merge with TAH.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 13 Aug 2005 15:13:37 -0800] rev 893
Turn off testing of absolute paths for now.
I don't know how to stop this from always reporting false errors, and am
too lazy to worry about it right now.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 13 Aug 2005 15:09:37 -0800] rev 892
Fix bug involving "hg debugwalk -Ipattern" from repository root.
Bryan O'Sullivan <bos@serpentine.com> [Sat, 13 Aug 2005 14:41:51 -0800] rev 891
Fix clone when target directory is relative.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 16:12:09 -0800] rev 890
Merge walk fixes.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 16:10:09 -0800] rev 889
Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 16:09:17 -0800] rev 888
Fix up handling of regexp paths.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 15:10:09 -0800] rev 887
Merge Windows path fixes.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 15:06:52 -0800] rev 886
Fix walk path handling on Windows
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 11:18:41 -0800] rev 885
Merge latest round of walk fixes.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 11:16:58 -0800] rev 884
Fix walk code for files that do not exist anywhere, and unhandled types.
Prior to this, a file that did not exist was reported as showing up in
the filesystem, as were files of unsupported types (such as fifos).
Now, an error message is printed and nothing is returned in such cases.
This change also moves the commands.pathto function to the util module,
as the walk code needs it to print non-confusing error messages.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 07:42:32 -0800] rev 883
Update to tip.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 10 Aug 2005 12:36:34 -0800] rev 882
Merge IPv6 fix.
Bryan O'Sullivan <bos@serpentine.com> [Wed, 10 Aug 2005 12:35:25 -0800] rev 881
Fix problem with "hg serve" on systems not providing IPv6.
mason@suse.com [Fri, 12 Aug 2005 07:12:08 -0800] rev 880
addremove was not correctly finding removed files when given
a list of files to look at. These end up with a src of 'f' from
walk() but no longer exist on the filesystem.
Index: mine/mercurial/commands.py
===================================================================
mason@suse.com [Fri, 12 Aug 2005 07:10:21 -0800] rev 879
dirstate walking optimizations
The repo walking code introduces a number of calls to dirstate.map.copy(),
significantly slowing down the walk on large trees. When a list of
files is passed to the walking code, we should only look at map entries
relevant to the file list passed in.
dirstate.filterfiles() is added to return a subset of the dirstate map.
The subset includes in files passed in, and if one of the files requested
is actually a directory, it includes any files inside that directory tree.
This brings the time for hg diff Makefile down from 1.7s to .3s on
a linux kernel repo.
Also, the diff command was unconditionally calling makewalk, leading
to an extra pass through repo.changes. This patch avoids the call
to makewalk when commands.diff isn't given a list of patterns, cutting
the time for hg diff (with no args) in half.
Index: mine/mercurial/hg.py
===================================================================
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 10:17:12 -0800] rev 878
Merge patchbomb script.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 08:04:31 -0800] rev 877
Polish patchbomb script.
diffstat output is now a non-default option.
The hgrc file can now contain default information for the patchbomb
script.
Date generation is fixed.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 09 Aug 2005 20:53:50 -0800] rev 876
Get patchbomb script to not use MIME attachments.
Adding patches as attachments makes it difficult or impossible for some
mail clients to quote them effectively.
Bryan O'Sullivan <bos@serpentine.com> [Tue, 09 Aug 2005 20:18:58 -0800] rev 875
Add patchbomb script.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 12 Aug 2005 09:58:35 -0800] rev 874
Merge Chris's changes with mine.
mason@suse.com [Fri, 12 Aug 2005 09:57:59 -0800] rev 873
addremove was not correctly finding removed files when given
a list of files to look at. These end up with a src of 'f' from
walk() but no longer exist on the filesystem.
Index: mine/mercurial/commands.py
===================================================================
mason@suse.com [Fri, 12 Aug 2005 09:57:56 -0800] rev 872
dirstate walking optimizations
The repo walking code introduces a number of calls to dirstate.map.copy(),
significantly slowing down the walk on large trees. When a list of
files is passed to the walking code, we should only look at map entries
relevant to the file list passed in.
dirstate.filterfiles() is added to return a subset of the dirstate map.
The subset includes in files passed in, and if one of the files requested
is actually a directory, it includes any files inside that directory tree.
This brings the time for hg diff Makefile down from 1.7s to .3s on
a linux kernel repo.
Also, the diff command was unconditionally calling makewalk, leading
to an extra pass through repo.changes. This patch avoids the call
to makewalk when commands.diff isn't given a list of patterns, cutting
the time for hg diff (with no args) in half.
Index: mine/mercurial/hg.py
===================================================================