Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-bad-pull.out
author Alecs King <alecsk@gmail.com>
Mon, 04 Jul 2005 12:15:44 -0800
changeset 612 9cd745437269
parent 547 4fc63e22b1fe
child 642 5d6177b72fcc
permissions -rw-r--r--
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote: # HG changeset patch # User Alecs King <alecsk@gmail.com> On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote: > On Sun, Jul 03, 2005 at 12:49:27AM +0800, Alecs King wrote: > > Hg is really very nice. The only feature i miss from git is the > > whatchanged -p, which shows a diff along with a changeset. > > python before, i just dig into the mercurial/commands.py a while and > > see what diff(), dodiff(), export(), show_changeset(), log() would > > normally do. There might be one thing or two missed or wrong. But here > > it is: a '-d' option to 'hg log' showing the diff info. You can use 'hg > > log -d' to show the whole history with the diff or 'hg log -d <file>' to > > show that info of a particular file. And also works with the '-r' > > option. > > Let's use -p. We're going to be combining the global and per command > switch namespace shortly and the global -p will disappear. Okay. '-d' changed to '-p'. Just like 'whatchanged -p', now we have 'hg log -p'. > Also, the argument list for show_changeset is getting a bit unwieldy. This time i remain show_changeset untouched at all. Only changed some bits of log().
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
503
c6a2e41c8c60 Fix troubles with clone and exception handling
mpm@selenic.com
parents: 395
diff changeset 
     1
 
+ hg clone http://localhost:20059/ copy
395
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
     2
 
requesting all changes
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
     3
 
adding changesets
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
     4
 
abort: error 111: Connection refused
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
     5
 
transaction abort!
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
     6
 
rollback completed
503
c6a2e41c8c60 Fix troubles with clone and exception handling
mpm@selenic.com
parents: 395
diff changeset 
     7
 
+ echo 255
c6a2e41c8c60 Fix troubles with clone and exception handling
mpm@selenic.com
parents: 395
diff changeset 
     8
 
255
c6a2e41c8c60 Fix troubles with clone and exception handling
mpm@selenic.com
parents: 395
diff changeset 
     9
 
+ ls copy
545
721bfca3a9dc Work-around failing tests/test-bad-pull with slow bg process.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 524
diff changeset 
    10
 
ls: copy: No such file or directory
503
c6a2e41c8c60 Fix troubles with clone and exception handling
mpm@selenic.com
parents: 395
diff changeset 
    11
 
+ cat
c6a2e41c8c60 Fix troubles with clone and exception handling
mpm@selenic.com
parents: 395
diff changeset 
    12
 
+ python dumb.py
545
721bfca3a9dc Work-around failing tests/test-bad-pull with slow bg process.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 524
diff changeset 
    13
 
+ sleep 2
503
c6a2e41c8c60 Fix troubles with clone and exception handling
mpm@selenic.com
parents: 395
diff changeset 
    14
 
+ hg clone http://localhost:20059/foo copy2
395
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
    15
 
requesting all changes
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
    16
 
adding changesets
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
    17
 
abort: HTTP Error 404: File not found
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
    18
 
transaction abort!
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset 
    19
 
rollback completed
503
c6a2e41c8c60 Fix troubles with clone and exception handling
mpm@selenic.com
parents: 395
diff changeset 
    20
 
+ echo 255
c6a2e41c8c60 Fix troubles with clone and exception handling
mpm@selenic.com
parents: 395
diff changeset 
    21
 
255
c6a2e41c8c60 Fix troubles with clone and exception handling
mpm@selenic.com
parents: 395
diff changeset 
    22
 
+ set +x
mercurial-crew-with-dirclash