comparison tests/test-histedit-commute.t @ 21950:af44c7a1e55e stable

histedit: respect revsetalias entries (issue4311) We now expand user-provided revsets before using repo.revs() to locate the root(s) of the user-specified set.
author Augie Fackler <raf@durin42.com>
date Mon, 28 Jul 2014 19:20:13 -0400
parents 5840da876235
children d2a5986cb89d
comparison
equal deleted inserted replaced
21949:ad56fc55cbc3 21950:af44c7a1e55e
322 o changeset: 0:cb9a9f314b8b 322 o changeset: 0:cb9a9f314b8b
323 user: test 323 user: test
324 date: Thu Jan 01 00:00:00 1970 +0000 324 date: Thu Jan 01 00:00:00 1970 +0000
325 summary: a 325 summary: a
326 326
327 Verify that revsetalias entries work with histedit:
328 $ cat >> $HGRCPATH <<EOF
329 > [revsetalias]
330 > grandparent(ARG) = p1(p1(ARG))
331 > EOF
332 $ echo extra commit >> c
333 $ hg ci -m 'extra commit to c'
334 $ HGEDITOR=cat hg histedit 'grandparent(.)'
335 pick ece0b8d93dda 6 c
336 pick 803ef1c6fcfd 7 e
337 pick 9c863c565126 8 extra commit to c
338
339 # Edit history between ece0b8d93dda and 9c863c565126
340 #
341 # Commits are listed from least to most recent
342 #
343 # Commands:
344 # p, pick = use commit
345 # e, edit = use commit, but stop for amending
346 # f, fold = use commit, but combine it with the one above
347 # d, drop = remove commit from history
348 # m, mess = edit message without changing commit content
349 #
350 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
327 351
328 should also work if a commit message is missing 352 should also work if a commit message is missing
329 $ BUNDLE="$TESTDIR/missing-comment.hg" 353 $ BUNDLE="$TESTDIR/missing-comment.hg"
330 $ hg init missing 354 $ hg init missing
331 $ cd missing 355 $ cd missing