[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] net.venge.monotone.issue-120: a0ac86f325152843
From: |
code |
Subject: |
[Monotone-commits-diffs] net.venge.monotone.issue-120: a0ac86f3251528432cb25a9654d9da5245139c70 |
Date: |
Thu, 24 Feb 2011 17:30:41 +0100 (CET) |
revision: a0ac86f3251528432cb25a9654d9da5245139c70
date: 2011-02-24T10:28:26
author: Richard Hopkins <address@hidden>
branch: net.venge.monotone.issue-120
changelog:
Added dummy_file variable for "nonsense" fp_second parameter in
friendly_node_summary
Just to emphasise that fp_second should be ignored in those cases as it's
not relevant, similar to the dummy_key, dummy_value variables for the
attribute handling.
manifest:
format_version "1"
new_manifest [ff2cfe57e1f06d5f03d569a40148117f744c8c9a]
old_revision [ebbf78482331fd3a4561cad0762cdaf92b2cf527]
patch "src/rev_output.cc"
from [47b3eb5059cd4628dff0b8133adc362f57ce50b1]
to [a9e63eb281ed57ac1ea7e0968722d3d5650e4e17]
============================================================
--- src/rev_output.cc 47b3eb5059cd4628dff0b8133adc362f57ce50b1
+++ src/rev_output.cc a9e63eb281ed57ac1ea7e0968722d3d5650e4e17
@@ -179,6 +179,7 @@ revision_summary(revision_t const & rev,
attr_key dummy_key;
attr_value dummy_value;
+ file_path dummy_file;
for (edge_map::const_iterator i = rev.edges.begin(); i != rev.edges.end(); ++i)
{
@@ -198,7 +199,7 @@ revision_summary(revision_t const & rev,
for (set<file_path>::const_iterator i = cs.nodes_deleted.begin();
i != cs.nodes_deleted.end(); ++i)
- out << friendly_node_summary(dropped, *i, *i, dummy_key,
+ out << friendly_node_summary(dropped, *i, dummy_file, dummy_key,
dummy_value);
for (map<file_path, file_path>::const_iterator
@@ -209,22 +210,22 @@ revision_summary(revision_t const & rev,
for (set<file_path>::const_iterator i = cs.dirs_added.begin();
i != cs.dirs_added.end(); ++i)
- out << friendly_node_summary(added, *i, *i, dummy_key,
+ out << friendly_node_summary(added, *i, dummy_file, dummy_key,
dummy_value);
for (map<file_path, file_id>::const_iterator i = cs.files_added.begin();
i != cs.files_added.end(); ++i)
- out << friendly_node_summary(added, i->first, i->first,
+ out << friendly_node_summary(added, i->first, dummy_file,
dummy_key, dummy_value);
for (map<file_path, pair<file_id, file_id> >::const_iterator
i = cs.deltas_applied.begin(); i != cs.deltas_applied.end(); ++i)
- out << friendly_node_summary(patched, i->first, i->first,
+ out << friendly_node_summary(patched, i->first, dummy_file,
dummy_key, dummy_value);
for (map<pair<file_path, attr_key>, attr_value >::const_iterator
i = cs.attrs_set.begin(); i != cs.attrs_set.end(); ++i)
- out << friendly_node_summary(attr_set, i->first.first, i->first.first,
+ out << friendly_node_summary(attr_set, i->first.first, dummy_file,
i->first.second, i->second);
// FIXME: naming here could not be more inconsistent
@@ -235,7 +236,7 @@ revision_summary(revision_t const & rev,
for (set<pair<file_path, attr_key> >::const_iterator
i = cs.attrs_cleared.begin(); i != cs.attrs_cleared.end(); ++i)
- out << friendly_node_summary(attr_unset, i->first, i->first,
+ out << friendly_node_summary(attr_unset, i->first, dummy_file,
i->second, dummy_value);
out << '\n';
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] net.venge.monotone.issue-120: a0ac86f3251528432cb25a9654d9da5245139c70,
code <=