# 
# patch "ChangeLog"
#  from [5c3d7675730904be66a8881e932045c9734dca6a]
#    to [023b33156c29e14765acde2bde4ae86da95ec975]
# 
# patch "commands.cc"
#  from [02840f7f28a0b9fafa6fe1816035ed6e5cf2fc8e]
#    to [6374417a8d763aec13e45054cf672798f542db2a]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,13 @@
 2005-04-23  Derek Scherger  <address@hidden>
 
+	* (calculate_restricted_revision): remove redundant variables,
+	avoiding path_rearrangement assignments and associated sanity
+	checks
+	(calculate_current_revision): rename empty to empty_args for
+	clarity
+
+2005-04-23  Derek Scherger  <address@hidden>
+
 	* commands.cc (calculate_base_revision): rename to ...
 	(get_base_revision): ... this, since it's not calculating anything
 	(calculate_base_manifest): rename to ...
--- commands.cc
+++ commands.cc
@@ -538,13 +538,13 @@
                               revision_set & rev,
                               manifest_map & m_old,
                               manifest_map & m_new,
-                              change_set::path_rearrangement & restricted_work)
+                              change_set::path_rearrangement & excluded)
 {
   manifest_id old_manifest_id;
   revision_id old_revision_id;    
   boost::shared_ptr<change_set> cs(new change_set());
   path_set old_paths, new_paths;
-  change_set::path_rearrangement work, included, excluded;
+  change_set::path_rearrangement work;
 
   rev.edges.clear();
   m_old.clear();
@@ -563,13 +563,10 @@
 
   app.set_restriction(valid_paths, args); 
 
-  restrict_path_rearrangement(work, included, excluded, app);
+  restrict_path_rearrangement(work, cs->rearrangement, excluded, app);
 
-  apply_path_rearrangement(old_paths, included, new_paths);
+  apply_path_rearrangement(old_paths, cs->rearrangement, new_paths);
 
-  cs->rearrangement = included;
-  restricted_work = excluded;
-
   build_restricted_manifest_map(new_paths, m_old, m_new, app);
   complete_change_set(m_old, m_new, *cs);
 
@@ -598,8 +595,8 @@
                            manifest_map & m_old,
                            manifest_map & m_new)
 {
-  vector<utf8> empty;
-  calculate_restricted_revision(app, empty, rev, m_old, m_new);
+  vector<utf8> empty_args;
+  calculate_restricted_revision(app, empty_args, rev, m_old, m_new);
 }
 
 static void