equal
deleted
inserted
replaced
604 dlg.hide() |
604 dlg.hide() |
605 |
605 |
606 def _checkout(self, menuitem): |
606 def _checkout(self, menuitem): |
607 row = self.model[self.tree.get_selection().get_selected()[1]] |
607 row = self.model[self.tree.get_selection().get_selected()[1]] |
608 rev = long(row[2]) |
608 rev = long(row[2]) |
|
609 parents0 = [x.node() for x in self.repo.workingctx().parents()] |
609 |
610 |
610 dialog = UpdateDialog(self.cwd, rev) |
611 dialog = UpdateDialog(self.cwd, rev) |
611 dialog.set_transient_for(self) |
612 dialog.set_transient_for(self) |
612 dialog.show_all() |
613 dialog.show_all() |
613 dialog.run() |
614 dialog.run() |
615 # FIXME: must remove transient explicitly to prevent history |
616 # FIXME: must remove transient explicitly to prevent history |
616 # dialog from getting pushed behind other app windows |
617 # dialog from getting pushed behind other app windows |
617 dialog.set_transient_for(None) |
618 dialog.set_transient_for(None) |
618 dialog.hide() |
619 dialog.hide() |
619 |
620 |
620 shell_notify([self.repo.root]) |
621 # FIXME: re-open repo to retrieve the new parent data |
621 self.repo.dirstate.invalidate() |
622 root = self.repo.root |
622 self.reload_log() |
623 del self.repo |
|
624 self.repo = hg.repository(ui.ui(), path=root) |
|
625 |
|
626 parents1 = [x.node() for x in self.repo.workingctx().parents()] |
|
627 if not parents0 == parents1: |
|
628 self.reload_log() |
623 |
629 |
624 def _merge(self, menuitem): |
630 def _merge(self, menuitem): |
625 row = self.model[self.tree.get_selection().get_selected()[1]] |
631 row = self.model[self.tree.get_selection().get_selected()[1]] |
626 rev = long(row[2]) |
632 rev = long(row[2]) |
627 parents0 = [x.node() for x in self.repo.workingctx().parents()] |
633 parents0 = [x.node() for x in self.repo.workingctx().parents()] |