comparison mercurial/commands.py @ 590:38d106db75bc

hg revert should revert to parent, not to tip

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

hg revert should revert to parent, not to tip

manifest hash: b6b622d0316f9f7ef60e500fb73844a4b0ad7b69
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCx27VywK+sNU5EO8RAnpHAKC1H3GAPC5wYlgpJG7Z7rWPl+vblQCeKVsz
UCjkaDw40evLbltWoY24xQs=
=dmvS
-----END PGP SIGNATURE-----

589:4be4d4580467

    """remove the specified files on the next commit"""
    repo.remove(relpath(repo, (file,) + files))

def revert(ui, repo, *names, **opts):
    """revert modified files or dirs back to their unmodified states"""
    node = opts['rev'] and repo.lookup(opts['rev']) or repo.changelog.tip()
    root = os.path.realpath(repo.root)
    def trimpath(p):
        p = os.path.realpath(p)
        if p.startswith(root):
            rest = p[len(root):]
            if not rest:
                return rest
            if p.startswith(os.sep):
                return rest[1:]
            return p
    relnames = map(trimpath, names or [os.getcwd()])
    chosen = {}
    def choose(name):
        def body(name):
            for r in relnames:
                if not name.startswith(r): continue
                rest = name[len(r):]

590:38d106db75bc

    """remove the specified files on the next commit"""
    repo.remove(relpath(repo, (file,) + files))

def revert(ui, repo, *names, **opts):
    """revert modified files or dirs back to their unmodified states"""
    node = opts['rev'] and repo.lookup(opts['rev']) or \
           repo.dirstate.parents()[0]
    root = os.path.realpath(repo.root)

    def trimpath(p):
        p = os.path.realpath(p)
        if p.startswith(root):
            rest = p[len(root):]
            if not rest:
                return rest
            if p.startswith(os.sep):
                return rest[1:]
            return p

    relnames = map(trimpath, names or [os.getcwd()])
    chosen = {}

    def choose(name):
        def body(name):
            for r in relnames:
                if not name.startswith(r): continue
                rest = name[len(r):]