comparison hgext/bookmarks.py @ 7250:352627bcafc3

bookmarks: Remove trailing space

7241:421f4cbddd68

import mercurial, mercurial.localrepo, mercurial.repair, os


def parse(repo):
    '''Parse .hg/bookmarks file and return a dictionary
    
    Bookmarks are stored as {HASH}\s{NAME}\n (localtags format) 
    values in the .hg/bookmarks file.
    They are read by the parse() method and returned as a dictionary with
    name => hash values.
    
    The parsed dictionary is cached until a write() operation is done.
    '''
    try:
        if repo._bookmarks:
            return repo._bookmarks

        pass
    return repo._bookmarks

def write(repo, refs):
    '''Write bookmarks
    
    Write the given bookmark => hash dictionary to the .hg/bookmarks file
    in a format equal to those of localtags.

    We also store a backup of the previous state in undo.bookmarks that
    can be copied back on rollback.

        file.write("%s %s\n" % (hex(node), refspec))
    file.close()

def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False, move=None):
    '''mercurial bookmarks
    
    Bookmarks are pointer to certain commits that move when commiting.
    Bookmarks are local. They can be renamed, copied and deleted.
    It is possible to use bookmark names in 'hg merge' and 'hg update' to 
    update to a given bookmark.
    
    You can use 'hg bookmark [NAME]' to set a bookmark on the current tip
    with the given name. If you specify a second [NAME] the bookmark is
    set to the bookmark that has that name. You can also pass revision
    identifiers to set bookmarks too.
    '''

            raise util.Abort(_("a bookmark of the same name already exists"))
        marks[mark] = marks[move]
        del marks[move]
        write(repo, marks)
        return
    
    if delete:
        if mark == None:
            raise util.Abort(_("bookmark name required"))
        if mark not in marks:
            raise util.Abort(_("a bookmark of this name does not exists"))

    if mark != None:
        if mark.strip().count("\n") > 0:
            raise Exception("bookmark cannot contain newlines")
        if mark in marks and not force:
            raise util.Abort(_("a bookmark of the same name already exists"))
        if ((mark in repo.branchtags() or mark == repo.dirstate.branch()) 
            and not force):
            raise util.Abort(_("a bookmark cannot have the name of an existing branch"))
        if rev:
            marks[mark] = repo.lookup(rev)
        else:

    class bookmark_repo(repo.__class__):
        def rollback(self):
            if os.path.exists(self.join('undo.bookmarks')):
                util.rename(self.join('undo.bookmarks'), self.join('bookmarks'))
            return super(bookmark_repo, self).rollback() 

        def lookup(self, key):
            if self._bookmarks is None:
                self._bookmarks = parse(self)
            if key in self._bookmarks:

7250:352627bcafc3

import mercurial, mercurial.localrepo, mercurial.repair, os


def parse(repo):
    '''Parse .hg/bookmarks file and return a dictionary

    Bookmarks are stored as {HASH}\s{NAME}\n (localtags format)
    values in the .hg/bookmarks file.
    They are read by the parse() method and returned as a dictionary with
    name => hash values.

    The parsed dictionary is cached until a write() operation is done.
    '''
    try:
        if repo._bookmarks:
            return repo._bookmarks

        pass
    return repo._bookmarks

def write(repo, refs):
    '''Write bookmarks

    Write the given bookmark => hash dictionary to the .hg/bookmarks file
    in a format equal to those of localtags.

    We also store a backup of the previous state in undo.bookmarks that
    can be copied back on rollback.

        file.write("%s %s\n" % (hex(node), refspec))
    file.close()

def bookmark(ui, repo, mark=None, rev=None, force=False, delete=False, move=None):
    '''mercurial bookmarks

    Bookmarks are pointer to certain commits that move when commiting.
    Bookmarks are local. They can be renamed, copied and deleted.
    It is possible to use bookmark names in 'hg merge' and 'hg update' to
    update to a given bookmark.

    You can use 'hg bookmark [NAME]' to set a bookmark on the current tip
    with the given name. If you specify a second [NAME] the bookmark is
    set to the bookmark that has that name. You can also pass revision
    identifiers to set bookmarks too.
    '''

            raise util.Abort(_("a bookmark of the same name already exists"))
        marks[mark] = marks[move]
        del marks[move]
        write(repo, marks)
        return

    if delete:
        if mark == None:
            raise util.Abort(_("bookmark name required"))
        if mark not in marks:
            raise util.Abort(_("a bookmark of this name does not exists"))

    if mark != None:
        if mark.strip().count("\n") > 0:
            raise Exception("bookmark cannot contain newlines")
        if mark in marks and not force:
            raise util.Abort(_("a bookmark of the same name already exists"))
        if ((mark in repo.branchtags() or mark == repo.dirstate.branch())
            and not force):
            raise util.Abort(_("a bookmark cannot have the name of an existing branch"))
        if rev:
            marks[mark] = repo.lookup(rev)
        else:

    class bookmark_repo(repo.__class__):
        def rollback(self):
            if os.path.exists(self.join('undo.bookmarks')):
                util.rename(self.join('undo.bookmarks'), self.join('bookmarks'))
            return super(bookmark_repo, self).rollback()

        def lookup(self, key):
            if self._bookmarks is None:
                self._bookmarks = parse(self)
            if key in self._bookmarks: