/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/uncommit.py

  • Committer: Vincent Ladeuil
  • Date: 2008-12-10 09:33:06 UTC
  • mto: (3941.1.1 bzr.integration)
  • mto: This revision was merged to the branch mainline in revision 3942.
  • Revision ID: v.ladeuil+lp@free.fr-20081210093306-j4l1wiesc76519fy
Make the filter work for paths and file ids.

* bzrlib/tests/test_delta.py:
(TestDeltaShow): Fix failing tests, the previous commit was wrong.
(TestDeltaShow._get_delta): Baah, fix status outputs.
(TestDeltaShow.test_delta_show_short_status_single_file_id_filter):
Test for file id filter.

* bzrlib/delta.py:
(TreeDelta): Rename path_filter to filter and pass it the file id
too.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/uncommit.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Remove the last revision from the history of the current branch."""
18
18
 
19
19
# TODO: make the guts of this methods on tree, branch.
20
20
 
 
21
import os
 
22
 
21
23
from bzrlib import (
22
24
    errors,
23
25
    revision as _mod_revision,
42
44
        if tree is not None:
43
45
            tree.lock_write()
44
46
            unlockable.append(tree)
45
 
 
 
47
        
46
48
        branch.lock_write()
47
49
        unlockable.append(branch)
48
50